Skip to content

Commit aeeb091

Browse files
authored
Merge pull request #431 from kantan2015/fix_arg_type_mismatch
Fix for the issue #430, arg_type_mismatch exception with dynamic link
2 parents eb0c07b + acbccbe commit aeeb091

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

example/unit_test_example_16.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ bool init_unit_test()
2020
#if (!defined(BOOST_TEST_DYN_LINK) || (!defined(BOOST_CLANG) || (BOOST_CLANG != 1) || (__clang_major__ >= 8))) && !defined(__APPLE__)
2121
log_level logLevel = runtime_config::get<log_level>(runtime_config::btrt_log_level);
2222
std::cout << "Current log level: " << static_cast<int>(logLevel) << std::endl;
23+
output_format logFormat = runtime_config::get<output_format>(runtime_config::btrt_log_format);
24+
std::cout << "Current log format: " << static_cast<int>(logFormat) << std::endl;
25+
report_level reportLevel = runtime_config::get<report_level>(runtime_config::btrt_report_level);
26+
std::cout << "Current report level: " << static_cast<int>(reportLevel) << std::endl;
2327
#endif
2428
return true;
2529
}

include/boost/test/detail/global_typedef.hpp

+11-7
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,21 @@ typedef unsigned long counter_t;
2929

3030
//____________________________________________________________________________//
3131

32-
enum report_level { INV_REPORT_LEVEL, CONFIRMATION_REPORT, SHORT_REPORT, DETAILED_REPORT, NO_REPORT };
32+
enum BOOST_SYMBOL_VISIBLE report_level { INV_REPORT_LEVEL,
33+
CONFIRMATION_REPORT,
34+
SHORT_REPORT,
35+
DETAILED_REPORT,
36+
NO_REPORT };
3337

3438
//____________________________________________________________________________//
3539

3640
//! Indicates the output format for the loggers or the test tree printing
37-
enum output_format { OF_INVALID,
38-
OF_CLF, ///< compiler log format
39-
OF_XML, ///< XML format for report and log,
40-
OF_JUNIT, ///< JUNIT format for report and log,
41-
OF_CUSTOM_LOGGER, ///< User specified logger.
42-
OF_DOT ///< dot format for output content
41+
enum BOOST_SYMBOL_VISIBLE output_format { OF_INVALID,
42+
OF_CLF, ///< compiler log format
43+
OF_XML, ///< XML format for report and log,
44+
OF_JUNIT, ///< JUNIT format for report and log,
45+
OF_CUSTOM_LOGGER, ///< User specified logger.
46+
OF_DOT ///< dot format for output content
4347
};
4448

4549
//____________________________________________________________________________//

0 commit comments

Comments
 (0)