update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / beast / test / beast / core / multi_buffer.cpp

diff --git a/ceph/src/boost/libs/beast/test/beast/core/multi_buffer.cpp b/ceph/src/boost/libs/beast/test/beast/core/multi_buffer.cpp
index 095af9be5602ecdfaadeb5cf29285447fbcd0eb0..7d6b90b4628c858306e99342032dc90e861437b2 100644 (file)
--- a/ceph/src/boost/libs/beast/test/beast/core/multi_buffer.cpp
+++ b/ceph/src/boost/libs/beast/test/beast/core/multi_buffer.cpp
@@ -37,10 +37,10 @@ public:
 
 #if ! BOOST_WORKAROUND(BOOST_LIBSTDCXX_VERSION, < 50000) && \
     ! BOOST_WORKAROUND(BOOST_MSVC, < 1910)
-    BOOST_STATIC_ASSERT(std::is_trivially_copyable<
-        multi_buffer::const_buffers_type>::value);
-    BOOST_STATIC_ASSERT(std::is_trivially_copyable<
-        multi_buffer::mutable_data_type>::value);
+//    BOOST_STATIC_ASSERT(std::is_trivially_copyable<
+//        multi_buffer::const_buffers_type>::value);
+//    BOOST_STATIC_ASSERT(std::is_trivially_copyable<
+//        multi_buffer::mutable_data_type>::value);
 #endif
 
     template<class Alloc1, class Alloc2>
@@ -237,8 +237,8 @@ public:
                 ostream(b1) << "Hello";
                 unequal_t a;
                 basic_multi_buffer<unequal_t> b2{std::move(b1), a};
-                BEAST_EXPECT(b1.size() == 0);
-                BEAST_EXPECT(b1.capacity() == 0);
+                BEAST_EXPECT(b1.size() != 0);
+                BEAST_EXPECT(b1.capacity() != 0);
                 BEAST_EXPECT(buffers_to_string(b2.data()) == "Hello");
                 BEAST_EXPECT(b1.max_size() == b2.max_size());
             }
@@ -300,8 +300,8 @@ public:
                 basic_multi_buffer<na_t> b2;
                 b2 = std::move(b1);
                 BEAST_EXPECT(b1.get_allocator() != b2.get_allocator());
-                BEAST_EXPECT(b1.size() == 0);
-                BEAST_EXPECT(b1.capacity() == 0);
+                BEAST_EXPECT(b1.size() != 0);
+                BEAST_EXPECT(b1.capacity() != 0);
                 BEAST_EXPECT(buffers_to_string(b2.data()) == "Hello");
             }
             {
@@ -816,13 +816,11 @@ public:
     void
     run() override
     {
-#if 1
         testShrinkToFit();
         testDynamicBuffer();
         testMembers();
         testMatrix1();
         testMatrix2();
-#endif
     }
 };