update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / property_map / test / function_property_map_test.cpp

diff --git a/ceph/src/boost/libs/property_map/test/function_property_map_test.cpp b/ceph/src/boost/libs/property_map/test/function_property_map_test.cpp
index 8f072ec3fd1f68ccb2b21056678b2bb8f0cb90c7..d66fa1066e3da1f54b811f6df39de610783f2c27 100644 (file)
--- a/ceph/src/boost/libs/property_map/test/function_property_map_test.cpp
+++ b/ceph/src/boost/libs/property_map/test/function_property_map_test.cpp
@@ -13,7 +13,7 @@
 #include <boost/property_map/function_property_map.hpp>
 #include <boost/concept/assert.hpp>
 #include <boost/property_map/property_map.hpp>
-#include <boost/test/minimal.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/static_assert.hpp>
 
 template <typename T>
@@ -30,7 +30,7 @@ struct return_fixed_ref {
   int& operator()(const T&) const {return *ptr;}
 };
 
-int test_main(int, char**) {
+int main() {
   using namespace boost;
   BOOST_CONCEPT_ASSERT((ReadablePropertyMapConcept<function_property_map<add1<int>, int>, int>));
   BOOST_CONCEPT_ASSERT((ReadablePropertyMapConcept<function_property_map<add1<int>, int, double>, int>));
@@ -45,22 +45,22 @@ int test_main(int, char**) {
   BOOST_STATIC_ASSERT((boost::is_same<boost::property_traits<function_property_map<add1_val<int>, int> >::category, boost::readable_property_map_tag>::value));
   BOOST_STATIC_ASSERT((boost::is_same<boost::property_traits<function_property_map<return_fixed_ref<int>, int> >::category, boost::lvalue_property_map_tag>::value));
 
-  BOOST_CHECK(get(function_property_map<add1<int>, int>(), 3) == 4);
-  BOOST_CHECK(get(function_property_map<add1<int>, int>(add1<int>()), 4) == 5);
-  BOOST_CHECK(get(make_function_property_map<int>(add1<int>()), 5) == 6);
-  BOOST_CHECK(get(function_property_map<add1_val<int>, int>(), 3) == 4);
-  BOOST_CHECK(get(function_property_map<add1_val<int>, int>(add1_val<int>()), 4) == 5);
-  BOOST_CHECK(get(make_function_property_map<int>(add1_val<int>()), 5) == 6);
+  BOOST_TEST(get(function_property_map<add1<int>, int>(), 3) == 4);
+  BOOST_TEST(get(function_property_map<add1<int>, int>(add1<int>()), 4) == 5);
+  BOOST_TEST(get(make_function_property_map<int>(add1<int>()), 5) == 6);
+  BOOST_TEST(get(function_property_map<add1_val<int>, int>(), 3) == 4);
+  BOOST_TEST(get(function_property_map<add1_val<int>, int>(add1_val<int>()), 4) == 5);
+  BOOST_TEST(get(make_function_property_map<int>(add1_val<int>()), 5) == 6);
   int val;
   const function_property_map<return_fixed_ref<int>, int> pm = return_fixed_ref<int>((&val));
   put(pm, 1, 6);
-  BOOST_CHECK(get(pm, 2) == 6);
-  BOOST_CHECK((get(pm, 3) = 7) == 7);
-  BOOST_CHECK(get(pm, 4) == 7);
+  BOOST_TEST(get(pm, 2) == 6);
+  BOOST_TEST((get(pm, 3) = 7) == 7);
+  BOOST_TEST(get(pm, 4) == 7);
   const function_property_map<return_fixed_ref<int>, int> pm2 = pm; // Check shallow copying
-  BOOST_CHECK(get(pm2, 5) == 7);
+  BOOST_TEST(get(pm2, 5) == 7);
   put(pm2, 3, 1);
-  BOOST_CHECK(get(pm, 1) == 1);
+  BOOST_TEST(get(pm, 1) == 1);
 
-  return 0;
+  return boost::report_errors();
 }