import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / test / impl / test_tools.ipp

diff --git a/ceph/src/boost/boost/test/impl/test_tools.ipp b/ceph/src/boost/boost/test/impl/test_tools.ipp
index 2956879326b43637f3b5d390ef1695e2fa4ac019..14934691cb23dbd2922835f917025c27f3bb18f7 100644 (file)
--- a/ceph/src/boost/boost/test/impl/test_tools.ipp
+++ b/ceph/src/boost/boost/test/impl/test_tools.ipp
@@ -16,6 +16,7 @@
 #define BOOST_TEST_TEST_TOOLS_IPP_012205GER
 
 // Boost.Test
+#include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test_log.hpp>
 #include <boost/test/tools/context.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
@@ -59,6 +60,13 @@ namespace std { using ::wcscmp; }
 #endif
 # endif
 
+
+namespace boost {
+namespace unit_test {
+  // local static variable, needed here for visibility reasons
+  lazy_ostream lazy_ostream::inst = lazy_ostream();
+}}
+
 namespace boost {
 namespace test_tools {
 namespace tt_detail {
@@ -374,7 +382,9 @@ report_assertion( assertion_result const&   ar,
         framework::assertion_result( AR_FAILED );
         framework::test_unit_aborted( framework::current_test_unit() );
         BOOST_TEST_I_THROW( execution_aborted() );
-        return false;
+        // the previous line either throws or aborts and the return below is not reached
+        // return false;
+        BOOST_UNREACHABLE_RETURN(false);
     }
 
     return true;