update sources to v12.2.3

[ceph.git] / ceph / src / boost / libs / container / test / string_test.cpp

diff --git a/ceph/src/boost/libs/container/test/string_test.cpp b/ceph/src/boost/libs/container/test/string_test.cpp
index c1c2e8969b1d02e37317f0895f24e0ab42cc9ff1..f54a35072395d539942890212bf2462d0d1d3727 100644 (file)
--- a/ceph/src/boost/libs/container/test/string_test.cpp
+++ b/ceph/src/boost/libs/container/test/string_test.cpp
@@ -24,7 +24,10 @@
 #include "expand_bwd_test_template.hpp"
 #include "propagate_allocator_test.hpp"
 #include "default_init_test.hpp"
+#include "comparison_test.hpp"
 #include "../../intrusive/test/iterator_test.hpp"
+#include <boost/utility/string_view.hpp>
+#include <boost/core/lightweight_test.hpp>
 
 using namespace boost::container;
 
@@ -182,6 +185,10 @@ int string_test()
          stdStringVect->push_back(auxStdString);
       }
 
+      if(auxBoostString.data() != const_cast<const BoostString&>(auxBoostString).data() &&
+         auxBoostString.data() != &auxBoostString[0])
+         return 1;
+
       if(!CheckEqualStringVector(boostStringVect, stdStringVect)){
          return 1;
       }
@@ -502,8 +509,10 @@ struct alloc_propagate_base<boost_container_string>
    };
 };
 
+
 }}}   //namespace boost::container::test
 
+
 int main()
 {
    if(string_test<char>()){
@@ -546,20 +555,24 @@ int main()
       typedef boost::container::basic_string<char> cont_int;
       cont_int a; a.push_back(char(1)); a.push_back(char(2)); a.push_back(char(3));
       boost::intrusive::test::test_iterator_random< cont_int >(a);
-      if(boost::report_errors() != 0) {
-         return 1;
-      }
    }
    {
       typedef boost::container::basic_string<wchar_t> cont_int;
       cont_int a; a.push_back(wchar_t(1)); a.push_back(wchar_t(2)); a.push_back(wchar_t(3));
       boost::intrusive::test::test_iterator_random< cont_int >(a);
-      if(boost::report_errors() != 0) {
+   }
+
+   ////////////////////////////////////
+   //    Comparison testing
+   ////////////////////////////////////
+   {
+      if(!boost::container::test::test_container_comparisons<string>())
+         return 1;
+      if(!boost::container::test::test_container_comparisons<wstring>())
          return 1;
-      }
    }
 
-   return 0;
+   return boost::report_errors();
 }
 
 #include <boost/container/detail/config_end.hpp>