update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / phoenix / test / bll_compatibility / ret_test.cpp

diff --git a/ceph/src/boost/libs/phoenix/test/bll_compatibility/ret_test.cpp b/ceph/src/boost/libs/phoenix/test/bll_compatibility/ret_test.cpp
index 82c947f0467bde2e2a27086163d6cc8616624ef2..5830db67ab7ce21d92f886b1aeea9845d14b9829 100644 (file)
--- a/ceph/src/boost/libs/phoenix/test/bll_compatibility/ret_test.cpp
+++ b/ceph/src/boost/libs/phoenix/test/bll_compatibility/ret_test.cpp
@@ -8,7 +8,7 @@
 //
 // For more information, see www.boost.org
 
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 #include <boost/lambda/lambda.hpp>
 
@@ -19,14 +19,14 @@ template<class R, class F>
 void test_ret(R r, F f) {
     typename F::result_type x = f();
     BOOST_MPL_ASSERT((boost::is_same<R, typename F::result_type>));
-    BOOST_CHECK(x == r);
+    BOOST_TEST(x == r);
 }
 
 template<class R, class F, class T1>
 void test_ret(R r, F f, T1& t1) {
     typename F::result_type x = f(t1);
     BOOST_MPL_ASSERT((boost::is_same<R, typename F::result_type>));
-    BOOST_CHECK(x == r);
+    BOOST_TEST(x == r);
 }
 
 class add_result {
@@ -44,10 +44,11 @@ add_result operator+(addable, addable) {
     return add_result(7);
 }
 
-int test_main(int, char*[]) {
+int main()
+{
     addable test;
     test_ret(add_result(7), boost::lambda::ret<add_result>(boost::lambda::_1 + test), test);
     test_ret(8.0, boost::lambda::ret<double>(boost::lambda::constant(7) + 1));
 
-    return 0;
+    return boost::report_errors();
 }