Merge pull request #420 from boostorg/develop

Merge for 1.86

Author: mborland

build/Jamfile.v2

@@ -6,7 +6,7 @@
 
 import os ;
 
-import ../../predef/check/predef
+import ../../predef/tools/check/predef
     : check
     : predef-check ;
 

include/boost/test/detail/config.hpp

@@ -136,7 +136,7 @@ class type_info;
 #define BOOST_PP_VARIADICS 1
 #endif
 
-#if BOOST_CLANG
+#ifdef BOOST_CLANG
 #define BOOST_PP_VARIADICS 1
 #endif
 
@@ -151,7 +151,8 @@ class type_info;
 #endif /* ifndef BOOST_PP_VARIADICS */
 
 // some versions of VC exibit a manifest error with this BOOST_UNREACHABLE_RETURN
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1910)
+// gcc <= 4.6 fails with unused variable even when the return is never reached 
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1910) || (defined(BOOST_GCC) && BOOST_GCC < 40700)
 # define BOOST_TEST_UNREACHABLE_RETURN(x) return x
 #else
 # define BOOST_TEST_UNREACHABLE_RETURN(x) BOOST_UNREACHABLE_RETURN(x)

include/boost/test/utils/named_params.hpp

@@ -131,11 +131,11 @@ struct nil {
 #else
     operator T const&() const
 #endif
-    { nfp_detail::report_access_to_invalid_parameter(true); static T* v = 0; return *v; }
+    { nfp_detail::report_access_to_invalid_parameter(true); static T* v = 0; BOOST_TEST_UNREACHABLE_RETURN(*v); }
 
     template<typename T>
     T any_cast() const
-    { nfp_detail::report_access_to_invalid_parameter(true); static typename remove_reference<T>::type* v = 0; return *v; }
+    { nfp_detail::report_access_to_invalid_parameter(true); static typename remove_reference<T>::type* v = 0; BOOST_TEST_UNREACHABLE_RETURN(*v); }
 
     template<typename Arg1>
     nil operator()( Arg1 const& )

test/Jamfile.v2

@@ -18,7 +18,7 @@ project boost/test-tests
     : requirements
     ;
 
-import ../../predef/check/predef
+import ../../predef/tools/check/predef
     : check require
     : predef-check predef-require ;