update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / interprocess / test / unordered_test.cpp

diff --git a/ceph/src/boost/libs/interprocess/test/unordered_test.cpp b/ceph/src/boost/libs/interprocess/test/unordered_test.cpp
index d65a6fc154edeb4b54567106df161015f13cbe08..e56d227a566f014e48a482b728b940feb8890122 100644 (file)
--- a/ceph/src/boost/libs/interprocess/test/unordered_test.cpp
+++ b/ceph/src/boost/libs/interprocess/test/unordered_test.cpp
@@ -25,7 +25,7 @@
 //->
 
 #include <functional> //std::equal_to
-#include <boost/functional/hash.hpp> //boost::hash
+#include <boost/container_hash/hash.hpp> //boost::hash
 
 namespace bip = boost::interprocess;
 
@@ -37,12 +37,12 @@ int main()
 {
    //Remove any other old shared memory from the system
    bip::shared_memory_object::remove(bip::test::get_process_id_name());
-   try {
+   BOOST_TRY {
       bip::managed_shared_memory shm(bip::create_only, bip::test::get_process_id_name(), 65536);
 
       //Elements to be inserted in unordered containers
       const int elements[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
-      const int elements_size = sizeof(elements)/sizeof(elements[0]);
+      const std::size_t elements_size = sizeof(elements)/sizeof(elements[0]);
 
       MyUnorderedSet *myset  =
          shm.construct<MyUnorderedSet>(bip::anonymous_instance)
@@ -58,14 +58,14 @@ int main()
             , shm.get_allocator<int>());
 
       //Insert elements and check sizes
-      myset->insert((&elements[0]), (&elements[elements_size]));
-      myset->insert((&elements[0]), (&elements[elements_size]));
-      mymset->insert((&elements[0]), (&elements[elements_size]));
-      mymset->insert((&elements[0]), (&elements[elements_size]));
+      myset->insert((&elements[0]), (&elements[std::ptrdiff_t(elements_size)]));
+      myset->insert((&elements[0]), (&elements[std::ptrdiff_t(elements_size)]));
+      mymset->insert((&elements[0]), (&elements[std::ptrdiff_t(elements_size)]));
+      mymset->insert((&elements[0]), (&elements[std::ptrdiff_t(elements_size)]));
 
-      if(myset->size() != (unsigned int)elements_size)
+      if(myset->size() != elements_size)
          return 1;
-      if(mymset->size() != (unsigned int)elements_size*2)
+      if(mymset->size() != elements_size*2u)
          return 1;
 
       //Destroy elements and check sizes
@@ -86,11 +86,11 @@ int main()
          return 1;
 
    }
-   catch(...){
+   BOOST_CATCH(...){
       //Remove shared memory from the system
       bip::shared_memory_object::remove(bip::test::get_process_id_name());
-      throw;
-   }
+      BOOST_RETHROW
+   } BOOST_CATCH_END
    //Remove shared memory from the system
    bip::shared_memory_object::remove(bip::test::get_process_id_name());
    return 0;