Merge branch 'trunk' into releases

airsim · Nov 4, 2019 · 9d30c94 · 9d30c94
2 parents e2a3643 + 64ffeb8
commit 9d30c94
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/test/airinv/InventoryTestSuite.cpp b/test/airinv/InventoryTestSuite.cpp
@@ -39,11 +39,11 @@ struct UnitTestConfig {
   /** Constructor. */
   UnitTestConfig() {
     boost_utf::unit_test_log.set_stream (utfReportStream);
-#if defined(BOOST_VERSION) && BOOST_VERSION >= 105900
+#if BOOST_VERSION_MACRO >= 105900
     boost_utf::unit_test_log.set_format (boost_utf::OF_XML);
-#else // BOOST_VERSION
+#else // BOOST_VERSION_MACRO
     boost_utf::unit_test_log.set_format (boost_utf::XML);
-#endif // BOOST_VERSION    
+#endif // BOOST_VERSION_MACRO
     boost_utf::unit_test_log.set_threshold_level (boost_utf::log_test_units);
     //boost_utf::unit_test_log.set_threshold_level (boost_utf::log_successful_tests);
   }