import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/libs/variant/test/test7.cpp b/ceph/src/boost/libs/variant/test/test7.cpp
index 7638ce58e1d483477949addc5787de179a87c709..1acec31e0d66d6a31a16768c3ec023f45bd77d23 100644 (file)
--- a/ceph/src/boost/libs/variant/test/test7.cpp
+++ b/ceph/src/boost/libs/variant/test/test7.cpp
@@ -16,7 +16,7 @@
 #pragma warning(disable:4244) // conversion from 'const int' to 'const short'
 #endif
 
-#include "boost/test/minimal.hpp"
+#include "boost/core/lightweight_test.hpp"
 #include "boost/variant.hpp"
 
 #include "jobs.h"
@@ -69,8 +69,8 @@ struct Tracker
    static void remove(const jas& j)
    {
       iterator_type iter = s_this_to_sn_.find(&j);
-      BOOST_CHECK(iter != s_this_to_sn_.end());
-      BOOST_CHECK( ((*iter).second) == j.sn_);
+      BOOST_TEST(iter != s_this_to_sn_.end());
+      BOOST_TEST( ((*iter).second) == j.sn_);
 
       int sn = (*iter).second;
       if(sn != j.sn_)
@@ -79,7 +79,7 @@ struct Tracker
             << ", other: this = " << &j << ", j.sn_ = " << j.sn_ << endl;
       }
 
-      BOOST_CHECK(sn == j.sn_);
+      BOOST_TEST(sn == j.sn_);
 
    
 
@@ -91,7 +91,7 @@ struct Tracker
 
    static void check()
    {
-      BOOST_CHECK(s_this_to_sn_.empty());      
+      BOOST_TEST(s_this_to_sn_.empty());      
    }
 };
 
@@ -214,7 +214,7 @@ void var_compare(const VariantType& v, ExpectedType expected)
    compare_helper<ExpectedType> ch(expected);
 
    bool checks = boost::apply_visitor(ch, v);
-   BOOST_CHECK(checks);
+   BOOST_TEST(checks);
 }
 
 
@@ -245,11 +245,11 @@ void run()
 }
 
 
-int test_main(int , char* [])
+int main()
 {
    run();
    Tracker::check();
 
-   return 0;
+   return boost::report_errors();
 }