Rename to DynamicBuffer_v0:

The Beast variation of Asio's DynamicBuffer_v1
is now named DynamicBuffer_v0.
This commit is contained in:
Richard Hodges
2020-02-21 12:05:57 +01:00
committed by Vinnie Falco
parent c340697171
commit eebf5773ed

View File

@@ -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 // VFALCO This trait needs tests
@@ -246,7 +246,7 @@ struct is_mutable_dynamic_buffer<T, detail::void_t<decltype(
std::declval<T&>().cdata(), std::declval<T&>().cdata(),
std::declval<typename T::mutable_data_type&>() = std::declval<typename T::mutable_data_type&>() =
std::declval<T&>().data() std::declval<T&>().data()
) > > : net::is_dynamic_buffer<T> ) > > : net::is_dynamic_buffer_v1<T>
{ {
}; };
/** @} */ /** @} */
@@ -271,28 +271,28 @@ buffers_fill(
} }
} }
template<class MutableDynamicBuffer> template<class MutableDynamicBuffer_v0>
void void
test_mutable_dynamic_buffer( test_mutable_dynamic_buffer(
MutableDynamicBuffer const&, MutableDynamicBuffer_v0 const&,
std::false_type) std::false_type)
{ {
} }
template<class MutableDynamicBuffer> template<class MutableDynamicBuffer_v0>
void void
test_mutable_dynamic_buffer( test_mutable_dynamic_buffer(
MutableDynamicBuffer const& b0, MutableDynamicBuffer_v0 const& b0,
std::true_type) std::true_type)
{ {
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
net::is_mutable_buffer_sequence<typename net::is_mutable_buffer_sequence<typename
MutableDynamicBuffer::mutable_data_type>::value); MutableDynamicBuffer_v0::mutable_data_type>::value);
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
std::is_convertible< std::is_convertible<
typename MutableDynamicBuffer::mutable_data_type, typename MutableDynamicBuffer_v0::mutable_data_type,
typename MutableDynamicBuffer::const_buffers_type>::value); typename MutableDynamicBuffer_v0::const_buffers_type>::value);
string_view src = "Hello, world!"; string_view src = "Hello, world!";
if(src.size() > b0.max_size()) if(src.size() > b0.max_size())
@@ -300,7 +300,7 @@ test_mutable_dynamic_buffer(
// modify readable bytes // modify readable bytes
{ {
MutableDynamicBuffer b(b0); MutableDynamicBuffer_v0 b(b0);
auto const mb = b.prepare(src.size()); auto const mb = b.prepare(src.size());
BEAST_EXPECT(buffer_bytes(mb) == src.size()); BEAST_EXPECT(buffer_bytes(mb) == src.size());
buffers_fill(mb, '*'); buffers_fill(mb, '*');
@@ -324,13 +324,13 @@ test_mutable_dynamic_buffer(
// mutable to const sequence conversion // mutable to const sequence conversion
{ {
MutableDynamicBuffer b(b0); MutableDynamicBuffer_v0 b(b0);
b.commit(net::buffer_copy( b.commit(net::buffer_copy(
b.prepare(src.size()), b.prepare(src.size()),
net::const_buffer(src.data(), src.size()))); net::const_buffer(src.data(), src.size())));
auto mb = b.data(); auto mb = b.data();
auto cb = static_cast< auto cb = static_cast<
MutableDynamicBuffer const&>(b).data(); MutableDynamicBuffer_v0 const&>(b).data();
auto cbc = b.cdata(); auto cbc = b.cdata();
BEAST_EXPECT( BEAST_EXPECT(
beast::buffers_to_string(b.data()) == src); 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. /** Test an instance of a dynamic buffer or mutable dynamic buffer.
*/ */
template<class DynamicBuffer> template<class DynamicBuffer_v0>
void void
test_dynamic_buffer( test_dynamic_buffer(
DynamicBuffer const& b0) DynamicBuffer_v0 const& b0)
{ {
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
net::is_dynamic_buffer<DynamicBuffer>::value); net::is_dynamic_buffer_v1<DynamicBuffer_v0>::value);
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
net::is_const_buffer_sequence<typename net::is_const_buffer_sequence<typename
DynamicBuffer::const_buffers_type>::value); DynamicBuffer_v0::const_buffers_type>::value);
BOOST_STATIC_ASSERT( BOOST_STATIC_ASSERT(
net::is_mutable_buffer_sequence<typename net::is_mutable_buffer_sequence<typename
DynamicBuffer::mutable_buffers_type>::value); DynamicBuffer_v0::mutable_buffers_type>::value);
BEAST_EXPECT(b0.size() == 0); BEAST_EXPECT(b0.size() == 0);
BEAST_EXPECT(buffer_bytes(b0.data()) == 0); BEAST_EXPECT(buffer_bytes(b0.data()) == 0);
@@ -383,14 +383,14 @@ test_dynamic_buffer(
{ {
string_view src = "Hello, world!"; string_view src = "Hello, world!";
DynamicBuffer b1(b0); DynamicBuffer_v0 b1(b0);
auto const mb = b1.prepare(src.size()); auto const mb = b1.prepare(src.size());
b1.commit(net::buffer_copy(mb, b1.commit(net::buffer_copy(mb,
net::const_buffer(src.data(), src.size()))); net::const_buffer(src.data(), src.size())));
// copy constructor // copy constructor
{ {
DynamicBuffer b2(b1); DynamicBuffer_v0 b2(b1);
BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT(b2.size() == b1.size());
BEAST_EXPECT( BEAST_EXPECT(
buffers_to_string(b1.data()) == buffers_to_string(b1.data()) ==
@@ -398,7 +398,7 @@ test_dynamic_buffer(
// https://github.com/boostorg/beast/issues/1621 // https://github.com/boostorg/beast/issues/1621
b2.consume(1); b2.consume(1);
DynamicBuffer b3(b2); DynamicBuffer_v0 b3(b2);
BEAST_EXPECT(b3.size() == b2.size()); BEAST_EXPECT(b3.size() == b2.size());
BEAST_EXPECT( BEAST_EXPECT(
buffers_to_string(b2.data()) == buffers_to_string(b2.data()) ==
@@ -407,8 +407,8 @@ test_dynamic_buffer(
// move constructor // move constructor
{ {
DynamicBuffer b2(b1); DynamicBuffer_v0 b2(b1);
DynamicBuffer b3(std::move(b2)); DynamicBuffer_v0 b3(std::move(b2));
BEAST_EXPECT(b3.size() == b1.size()); BEAST_EXPECT(b3.size() == b1.size());
BEAST_EXPECT( BEAST_EXPECT(
buffers_to_string(b3.data()) == buffers_to_string(b3.data()) ==
@@ -417,7 +417,7 @@ test_dynamic_buffer(
// copy assignment // copy assignment
{ {
DynamicBuffer b2(b0); DynamicBuffer_v0 b2(b0);
b2 = b1; b2 = b1;
BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT(b2.size() == b1.size());
BEAST_EXPECT( BEAST_EXPECT(
@@ -433,7 +433,7 @@ test_dynamic_buffer(
// https://github.com/boostorg/beast/issues/1621 // https://github.com/boostorg/beast/issues/1621
b2.consume(1); b2.consume(1);
DynamicBuffer b3(b2); DynamicBuffer_v0 b3(b2);
BEAST_EXPECT(b3.size() == b2.size()); BEAST_EXPECT(b3.size() == b2.size());
BEAST_EXPECT( BEAST_EXPECT(
buffers_to_string(b2.data()) == buffers_to_string(b2.data()) ==
@@ -443,8 +443,8 @@ test_dynamic_buffer(
// move assignment // move assignment
{ {
DynamicBuffer b2(b1); DynamicBuffer_v0 b2(b1);
DynamicBuffer b3(b0); DynamicBuffer_v0 b3(b0);
b3 = std::move(b2); b3 = std::move(b2);
BEAST_EXPECT(b3.size() == b1.size()); BEAST_EXPECT(b3.size() == b1.size());
BEAST_EXPECT( BEAST_EXPECT(
@@ -461,8 +461,8 @@ test_dynamic_buffer(
// swap // swap
{ {
DynamicBuffer b2(b1); DynamicBuffer_v0 b2(b1);
DynamicBuffer b3(b0); DynamicBuffer_v0 b3(b0);
BEAST_EXPECT(b2.size() == b1.size()); BEAST_EXPECT(b2.size() == b1.size());
BEAST_EXPECT(b3.size() == b0.size()); BEAST_EXPECT(b3.size() == b0.size());
using std::swap; using std::swap;
@@ -477,7 +477,7 @@ test_dynamic_buffer(
// n == 0 // n == 0
{ {
DynamicBuffer b(b0); DynamicBuffer_v0 b(b0);
b.commit(1); b.commit(1);
BEAST_EXPECT(b.size() == 0); BEAST_EXPECT(b.size() == 0);
BEAST_EXPECT(buffer_bytes(b.prepare(0)) == 0); BEAST_EXPECT(buffer_bytes(b.prepare(0)) == 0);
@@ -497,7 +497,7 @@ test_dynamic_buffer(
// max_size // max_size
{ {
DynamicBuffer b(b0); DynamicBuffer_v0 b(b0);
if(BEAST_EXPECT( if(BEAST_EXPECT(
b.max_size() + 1 > b.max_size())) b.max_size() + 1 > b.max_size()))
{ {
@@ -537,7 +537,7 @@ test_dynamic_buffer(
// readable / writable buffer sequence tests // readable / writable buffer sequence tests
{ {
make_new_src(); make_new_src();
DynamicBuffer b(b0); DynamicBuffer_v0 b(b0);
auto const& bc(b); auto const& bc(b);
auto const mb = b.prepare(src.size()); auto const mb = b.prepare(src.size());
BEAST_EXPECT(buffer_bytes(mb) == src.size()); BEAST_EXPECT(buffer_bytes(mb) == src.size());
@@ -562,7 +562,7 @@ test_dynamic_buffer(
{ {
make_new_src(); make_new_src();
DynamicBuffer b(b0); DynamicBuffer_v0 b(b0);
auto const& bc(b); auto const& bc(b);
net::const_buffer cb(in.data(), in.size()); net::const_buffer cb(in.data(), in.size());
while(cb.size() > 0) while(cb.size() > 0)
@@ -588,9 +588,9 @@ test_dynamic_buffer(
} } } } } }
} }
// MutableDynamicBuffer refinement // MutableDynamicBuffer_v0 refinement
detail::test_mutable_dynamic_buffer(b0, detail::test_mutable_dynamic_buffer(b0,
is_mutable_dynamic_buffer<DynamicBuffer>{}); is_mutable_dynamic_buffer<DynamicBuffer_v0>{});
} }
} // beast } // beast