import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / libs / variant / test / variant_reference_test.cpp

diff --git a/ceph/src/boost/libs/variant/test/variant_reference_test.cpp b/ceph/src/boost/libs/variant/test/variant_reference_test.cpp
index d10c0f8513542e17f865a6ffcae6b0bf40efedde..3f7f5812596e2f5550fdeab3156564484faf5c4f 100644 (file)
--- a/ceph/src/boost/libs/variant/test/variant_reference_test.cpp
+++ b/ceph/src/boost/libs/variant/test/variant_reference_test.cpp
@@ -11,7 +11,7 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include "boost/variant.hpp"
-#include "boost/test/minimal.hpp"
+#include "boost/core/lightweight_test.hpp"
 
 #include "boost/mpl/bool.hpp"
 #include "boost/type_traits/add_reference.hpp"
@@ -55,37 +55,37 @@ wknd_get(boost::variant<T>& var, int)
 template <typename T>
 void test_reference_content(T& t, const T& value1, const T& value2)
 {
-    BOOST_CHECK( !(value1 == value2) );
+    BOOST_TEST( !(value1 == value2) );
 
     /////
 
     boost::variant< T& > var(t);
-    BOOST_CHECK(( boost::get<T>(&var) == &t ));
+    BOOST_TEST(( boost::get<T>(&var) == &t ));
 
     t = value1;
-    BOOST_CHECK(( boost::get<T>(var) == value1 ));
+    BOOST_TEST(( boost::get<T>(var) == value1 ));
 
     /////
 
     boost::variant< T > var2(var);
-    BOOST_CHECK(( boost::get<T>(var2) == value1 ));
+    BOOST_TEST(( boost::get<T>(var2) == value1 ));
 
     t = value2;
-    BOOST_CHECK(( boost::get<T>(var2) == value1 ));
+    BOOST_TEST(( boost::get<T>(var2) == value1 ));
 }
 
 template <typename Base, typename Derived>
 void base_derived_test(Derived d)
 {
     Base b(d);
-    BOOST_CHECK((check_base_derived(
+    BOOST_TEST((check_base_derived(
           b
         , d
         , 1L
         )));
 
     boost::variant<Base> base_var(d);
-    BOOST_CHECK((check_base_derived(
+    BOOST_TEST((check_base_derived(
           wknd_get(base_var, 1L)
         , d
         , 1L
@@ -93,14 +93,14 @@ void base_derived_test(Derived d)
 
     boost::variant<Derived> derived_var(d);
     boost::variant<Base> base_from_derived_var(derived_var);
-    BOOST_CHECK((check_base_derived(
+    BOOST_TEST((check_base_derived(
           wknd_get(base_from_derived_var, 1L)
         , wknd_get(derived_var, 1L)
         , 1L
         )));
 }
 
-int test_main(int , char* [])
+int main()
 {
     int i = 0;
     test_reference_content(i, 1, 2);
@@ -112,5 +112,5 @@ int test_main(int , char* [])
     base_derived_test< base_t*,derived_t* >(&d);
     base_derived_test< base_t&,derived_t& >(d);
 
-    return boost::exit_success;
+    return boost::report_errors();
 }