update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / intrusive / test / test_container.hpp

diff --git a/ceph/src/boost/libs/intrusive/test/test_container.hpp b/ceph/src/boost/libs/intrusive/test/test_container.hpp
index 6e98071f2de9fdf59a61cfc839f8b53e513d6341..36a62894a5839d633ddfb005a5c0fbc8f51f4805 100644 (file)
--- a/ceph/src/boost/libs/intrusive/test/test_container.hpp
+++ b/ceph/src/boost/libs/intrusive/test/test_container.hpp
@@ -13,7 +13,7 @@
 #ifndef BOOST_INTRUSIVE_TEST_CONTAINER_HPP
 #define BOOST_INTRUSIVE_TEST_CONTAINER_HPP
 
-#include <boost/detail/lightweight_test.hpp>
+#include <boost/core/lightweight_test.hpp>
 #include <boost/intrusive/detail/mpl.hpp>
 #include <boost/intrusive/detail/simple_disposers.hpp>
 #include <boost/intrusive/detail/iterator.hpp>
@@ -473,14 +473,14 @@ void test_unordered_associative_container_invariants(Container & c, Data & d)
       di != de ; ++di ){
       const_iterator i = c.find(key_of_value()(*di));
       size_type nb = c.bucket(key_of_value()(*i));
-      size_type bucket_elem = boost::intrusive::iterator_distance(c.begin(nb), c.end(nb));
+      size_type bucket_elem = (size_type) boost::intrusive::iterator_distance(c.begin(nb), c.end(nb));
       BOOST_TEST( bucket_elem ==  c.bucket_size(nb) );
       BOOST_TEST( &*c.local_iterator_to(*c.find(key_of_value()(*di))) == &*i );
       BOOST_TEST( &*c.local_iterator_to(*const_cast<const Container &>(c).find(key_of_value()(*di))) == &*i );
       BOOST_TEST( &*Container::s_local_iterator_to(*c.find(key_of_value()(*di))) == &*i );
       BOOST_TEST( &*Container::s_local_iterator_to(*const_cast<const Container &>(c).find(key_of_value()(*di))) == &*i );
       std::pair<const_iterator, const_iterator> er = c.equal_range(key_of_value()(*di));
-      size_type cnt = boost::intrusive::iterator_distance(er.first, er.second);
+      size_type cnt = (size_type) boost::intrusive::iterator_distance(er.first, er.second);
       BOOST_TEST( cnt == c.count(key_of_value()(*di)));
       if(cnt > 1){
          const_iterator n = er.first;
@@ -493,10 +493,10 @@ void test_unordered_associative_container_invariants(Container & c, Data & d)
       }
    }
 
-   size_type blen = c.bucket_count();
-   size_type total_objects = 0;
+   std::size_t blen = c.bucket_count();
+   std::size_t total_objects = 0;
    for(size_type i = 0; i < blen; ++i){
-      total_objects += c.bucket_size(i);
+      total_objects += std::size_t(c.bucket_size(i));
    }
    BOOST_TEST( total_objects ==  c.size() );
 }