From eebf5773edddc405348bea17beca417cbea11666 Mon Sep 17 00:00:00 2001 From: Richard Hodges Date: Fri, 21 Feb 2020 12:05:57 +0100 Subject: [PATCH] Rename to DynamicBuffer_v0: The Beast variation of Asio's DynamicBuffer_v1 is now named DynamicBuffer_v0. --- test/beast/core/test_buffer.hpp | 68 ++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/test/beast/core/test_buffer.hpp b/test/beast/core/test_buffer.hpp index 8aff2edb..8cc6e555 100644 --- a/test/beast/core/test_buffer.hpp +++ b/test/beast/core/test_buffer.hpp @@ -228,7 +228,7 @@ test_buffer_sequence( //------------------------------------------------------------------------------ -/** Metafunction to determine if a type meets the requirements of MutableDynamicBuffer +/** Metafunction to determine if a type meets the requirements of MutableDynamicBuffer_v0 */ /* @{ */ // VFALCO This trait needs tests @@ -246,7 +246,7 @@ struct is_mutable_dynamic_buffer().cdata(), std::declval() = std::declval().data() - ) > > : net::is_dynamic_buffer + ) > > : net::is_dynamic_buffer_v1 { }; /** @} */ @@ -271,28 +271,28 @@ buffers_fill( } } -template +template void test_mutable_dynamic_buffer( - MutableDynamicBuffer const&, + MutableDynamicBuffer_v0 const&, std::false_type) { } -template +template void test_mutable_dynamic_buffer( - MutableDynamicBuffer const& b0, + MutableDynamicBuffer_v0 const& b0, std::true_type) { BOOST_STATIC_ASSERT( net::is_mutable_buffer_sequence::value); + MutableDynamicBuffer_v0::mutable_data_type>::value); BOOST_STATIC_ASSERT( std::is_convertible< - typename MutableDynamicBuffer::mutable_data_type, - typename MutableDynamicBuffer::const_buffers_type>::value); + typename MutableDynamicBuffer_v0::mutable_data_type, + typename MutableDynamicBuffer_v0::const_buffers_type>::value); string_view src = "Hello, world!"; if(src.size() > b0.max_size()) @@ -300,7 +300,7 @@ test_mutable_dynamic_buffer( // modify readable bytes { - MutableDynamicBuffer b(b0); + MutableDynamicBuffer_v0 b(b0); auto const mb = b.prepare(src.size()); BEAST_EXPECT(buffer_bytes(mb) == src.size()); buffers_fill(mb, '*'); @@ -324,13 +324,13 @@ test_mutable_dynamic_buffer( // mutable to const sequence conversion { - MutableDynamicBuffer b(b0); + MutableDynamicBuffer_v0 b(b0); b.commit(net::buffer_copy( b.prepare(src.size()), net::const_buffer(src.data(), src.size()))); auto mb = b.data(); auto cb = static_cast< - MutableDynamicBuffer const&>(b).data(); + MutableDynamicBuffer_v0 const&>(b).data(); auto cbc = b.cdata(); BEAST_EXPECT( beast::buffers_to_string(b.data()) == src); @@ -360,21 +360,21 @@ test_mutable_dynamic_buffer( /** Test an instance of a dynamic buffer or mutable dynamic buffer. */ -template +template void test_dynamic_buffer( - DynamicBuffer const& b0) + DynamicBuffer_v0 const& b0) { BOOST_STATIC_ASSERT( - net::is_dynamic_buffer::value); + net::is_dynamic_buffer_v1::value); BOOST_STATIC_ASSERT( net::is_const_buffer_sequence::value); + DynamicBuffer_v0::const_buffers_type>::value); BOOST_STATIC_ASSERT( net::is_mutable_buffer_sequence::value); + DynamicBuffer_v0::mutable_buffers_type>::value); BEAST_EXPECT(b0.size() == 0); BEAST_EXPECT(buffer_bytes(b0.data()) == 0); @@ -383,14 +383,14 @@ test_dynamic_buffer( { string_view src = "Hello, world!"; - DynamicBuffer b1(b0); + DynamicBuffer_v0 b1(b0); auto const mb = b1.prepare(src.size()); b1.commit(net::buffer_copy(mb, net::const_buffer(src.data(), src.size()))); // copy constructor { - DynamicBuffer b2(b1); + DynamicBuffer_v0 b2(b1); BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT( buffers_to_string(b1.data()) == @@ -398,7 +398,7 @@ test_dynamic_buffer( // https://github.com/boostorg/beast/issues/1621 b2.consume(1); - DynamicBuffer b3(b2); + DynamicBuffer_v0 b3(b2); BEAST_EXPECT(b3.size() == b2.size()); BEAST_EXPECT( buffers_to_string(b2.data()) == @@ -407,8 +407,8 @@ test_dynamic_buffer( // move constructor { - DynamicBuffer b2(b1); - DynamicBuffer b3(std::move(b2)); + DynamicBuffer_v0 b2(b1); + DynamicBuffer_v0 b3(std::move(b2)); BEAST_EXPECT(b3.size() == b1.size()); BEAST_EXPECT( buffers_to_string(b3.data()) == @@ -417,7 +417,7 @@ test_dynamic_buffer( // copy assignment { - DynamicBuffer b2(b0); + DynamicBuffer_v0 b2(b0); b2 = b1; BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT( @@ -433,7 +433,7 @@ test_dynamic_buffer( // https://github.com/boostorg/beast/issues/1621 b2.consume(1); - DynamicBuffer b3(b2); + DynamicBuffer_v0 b3(b2); BEAST_EXPECT(b3.size() == b2.size()); BEAST_EXPECT( buffers_to_string(b2.data()) == @@ -443,8 +443,8 @@ test_dynamic_buffer( // move assignment { - DynamicBuffer b2(b1); - DynamicBuffer b3(b0); + DynamicBuffer_v0 b2(b1); + DynamicBuffer_v0 b3(b0); b3 = std::move(b2); BEAST_EXPECT(b3.size() == b1.size()); BEAST_EXPECT( @@ -461,8 +461,8 @@ test_dynamic_buffer( // swap { - DynamicBuffer b2(b1); - DynamicBuffer b3(b0); + DynamicBuffer_v0 b2(b1); + DynamicBuffer_v0 b3(b0); BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT(b3.size() == b0.size()); using std::swap; @@ -477,7 +477,7 @@ test_dynamic_buffer( // n == 0 { - DynamicBuffer b(b0); + DynamicBuffer_v0 b(b0); b.commit(1); BEAST_EXPECT(b.size() == 0); BEAST_EXPECT(buffer_bytes(b.prepare(0)) == 0); @@ -497,7 +497,7 @@ test_dynamic_buffer( // max_size { - DynamicBuffer b(b0); + DynamicBuffer_v0 b(b0); if(BEAST_EXPECT( b.max_size() + 1 > b.max_size())) { @@ -537,7 +537,7 @@ test_dynamic_buffer( // readable / writable buffer sequence tests { make_new_src(); - DynamicBuffer b(b0); + DynamicBuffer_v0 b(b0); auto const& bc(b); auto const mb = b.prepare(src.size()); BEAST_EXPECT(buffer_bytes(mb) == src.size()); @@ -562,7 +562,7 @@ test_dynamic_buffer( { make_new_src(); - DynamicBuffer b(b0); + DynamicBuffer_v0 b(b0); auto const& bc(b); net::const_buffer cb(in.data(), in.size()); while(cb.size() > 0) @@ -588,9 +588,9 @@ test_dynamic_buffer( } } } } - // MutableDynamicBuffer refinement + // MutableDynamicBuffer_v0 refinement detail::test_mutable_dynamic_buffer(b0, - is_mutable_dynamic_buffer{}); + is_mutable_dynamic_buffer{}); } } // beast