Merge pull request #410 from boostorg/develop

Merge for 1.85
boostorg · Feb 29, 2024 · 822dc24 · 822dc24
2 parents 0dcca18 + 100a13c
commit 822dc24
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 5 deletions.
diff --git a/include/boost/test/detail/config.hpp b/include/boost/test/detail/config.hpp
@@ -165,7 +165,7 @@ class type_info;
 #if (defined(BOOST_MSVC) && BOOST_MSVC < 1900) || (defined(BOOST_GCC) && BOOST_GCC < 40700)
 #  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) fun body
 #else
-#  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) BOOST_DEFAULTED_FUNCTION(fun, body);
+#  define BOOST_TEST_DEFAULTED_FUNCTION(fun, body) BOOST_DEFAULTED_FUNCTION(fun, body)
 #endif
 
 //____________________________________________________________________________//

diff --git a/include/boost/test/impl/test_tools.ipp b/include/boost/test/impl/test_tools.ipp
@@ -320,6 +320,11 @@ format_report( OutStream& os, assertion_result const& pr, unit_test::lazy_ostrea
 
 //____________________________________________________________________________//
 
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4702) // There is intentionally unreachable code
+#endif
+
 bool
 report_assertion( assertion_result const&   ar,
                   lazy_ostream const&       assertion_descr,
@@ -411,6 +416,10 @@ report_assertion( assertion_result const&   ar,
     return true;
 }
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 //____________________________________________________________________________//
 
 assertion_result

diff --git a/include/boost/test/prg_exec_monitor.hpp b/include/boost/test/prg_exec_monitor.hpp
@@ -30,6 +30,7 @@
 
 // Automatically link to the correct build variant where possible.
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_PRG_EXEC_MONITOR_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
 #  define BOOST_LIB_NAME boost_prg_exec_monitor
 

diff --git a/include/boost/test/test_exec_monitor.hpp b/include/boost/test/test_exec_monitor.hpp
@@ -43,6 +43,7 @@
 
 // Automatically link to the correct build variant where possible.
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_TEST_EXEC_MONITOR_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED)
 
 #  define BOOST_LIB_NAME boost_test_exec_monitor

diff --git a/include/boost/test/tools/detail/print_helper.hpp b/include/boost/test/tools/detail/print_helper.hpp
@@ -97,7 +97,7 @@ struct print_log_value {
     std::streamsize set_precision( std::ostream& ostr, mpl::false_ )
     {
         if( std::numeric_limits<T>::is_specialized && std::numeric_limits<T>::radix == 2 )
-            return ostr.precision( 2 + std::numeric_limits<T>::digits * 301/1000 );
+            return ostr.precision( 2 + std::streamsize(std::numeric_limits<T>::digits) * 301/1000 );
         else if ( std::numeric_limits<T>::is_specialized && std::numeric_limits<T>::radix == 10 ) {
 #ifdef BOOST_NO_CXX11_NUMERIC_LIMITS
             // (was BOOST_NO_NUMERIC_LIMITS_LOWEST but now deprecated).

diff --git a/include/boost/test/unit_test.hpp b/include/boost/test/unit_test.hpp
@@ -25,6 +25,7 @@
 // ************************************************************************** //
 
 #if !defined(BOOST_ALL_NO_LIB) && !defined(BOOST_TEST_NO_LIB) && \
+    !defined(BOOST_UNIT_TEST_FRAMEWORK_NO_LIB) && \
     !defined(BOOST_TEST_SOURCE) && !defined(BOOST_TEST_INCLUDED) && \
     defined(BOOST_TEST_MAIN)
 #  define BOOST_LIB_NAME boost_unit_test_framework

diff --git a/meta/libraries.json b/meta/libraries.json
@@ -11,7 +11,8 @@
     ],
     "maintainers": [
         "Gennadiy Rozental <rogeeff -at- gmail.com>",
-        "Raffi Enficiaud <raffi.enficiaud -at- free.fr>"
+        "Raffi Enficiaud <raffi.enficiaud -at- free.fr>",
+        "Matt Borland <matt -at- mattborland.com>"
     ],
-    "cxxstd": "03"
+    "cxxstd": "11"
 }
diff --git a/test/test-organization-ts/test-tree-management-test.cpp b/test/test-organization-ts/test-tree-management-test.cpp
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE( manual_test_case_creation_test )
     BOOST_TEST( tc1->p_expected_failures == 0U );
     BOOST_TEST( tc1->p_timeout == 0U );
     BOOST_TEST( tc1->p_name == const_string( "empty_" ) );
-    BOOST_TEST( tc1->p_test_func );
+    BOOST_TEST( static_cast<bool>(tc1->p_test_func.get()) );
     BOOST_TEST( tc1->p_default_status == test_unit::RS_INHERIT );
     BOOST_TEST( tc1->p_run_status == test_unit::RS_INVALID );
     BOOST_TEST( !tc1->is_enabled() );