Skip to content

Commit

Permalink
Merge pull request #431 from kantan2015/fix_arg_type_mismatch
Browse files Browse the repository at this point in the history
Fix for the issue #430, arg_type_mismatch exception with dynamic link
  • Loading branch information
mborland authored Oct 4, 2024
2 parents eb0c07b + acbccbe commit aeeb091
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
4 changes: 4 additions & 0 deletions example/unit_test_example_16.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ bool init_unit_test()
#if (!defined(BOOST_TEST_DYN_LINK) || (!defined(BOOST_CLANG) || (BOOST_CLANG != 1) || (__clang_major__ >= 8))) && !defined(__APPLE__)
log_level logLevel = runtime_config::get<log_level>(runtime_config::btrt_log_level);
std::cout << "Current log level: " << static_cast<int>(logLevel) << std::endl;
output_format logFormat = runtime_config::get<output_format>(runtime_config::btrt_log_format);
std::cout << "Current log format: " << static_cast<int>(logFormat) << std::endl;
report_level reportLevel = runtime_config::get<report_level>(runtime_config::btrt_report_level);
std::cout << "Current report level: " << static_cast<int>(reportLevel) << std::endl;
#endif
return true;
}
Expand Down
18 changes: 11 additions & 7 deletions include/boost/test/detail/global_typedef.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,21 @@ typedef unsigned long counter_t;

//____________________________________________________________________________//

enum report_level { INV_REPORT_LEVEL, CONFIRMATION_REPORT, SHORT_REPORT, DETAILED_REPORT, NO_REPORT };
enum BOOST_SYMBOL_VISIBLE report_level { INV_REPORT_LEVEL,
CONFIRMATION_REPORT,
SHORT_REPORT,
DETAILED_REPORT,
NO_REPORT };

//____________________________________________________________________________//

//! Indicates the output format for the loggers or the test tree printing
enum output_format { OF_INVALID,
OF_CLF, ///< compiler log format
OF_XML, ///< XML format for report and log,
OF_JUNIT, ///< JUNIT format for report and log,
OF_CUSTOM_LOGGER, ///< User specified logger.
OF_DOT ///< dot format for output content
enum BOOST_SYMBOL_VISIBLE output_format { OF_INVALID,
OF_CLF, ///< compiler log format
OF_XML, ///< XML format for report and log,
OF_JUNIT, ///< JUNIT format for report and log,
OF_CUSTOM_LOGGER, ///< User specified logger.
OF_DOT ///< dot format for output content
};

//____________________________________________________________________________//
Expand Down

0 comments on commit aeeb091

Please sign in to comment.