mirror of
https://github.com/boostorg/beast.git
synced 2025-08-02 22:34:32 +02:00
null_buffers is deprecated
This commit is contained in:
@@ -3,6 +3,7 @@ Version 145:
|
|||||||
* Rename some detail functions
|
* Rename some detail functions
|
||||||
* Refactor basic_fields allocator internals
|
* Refactor basic_fields allocator internals
|
||||||
* Refactor HTTP async read composed operations
|
* Refactor HTTP async read composed operations
|
||||||
|
* null_buffers is deprecated
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -100,7 +100,7 @@ struct empty_body
|
|||||||
struct writer
|
struct writer
|
||||||
{
|
{
|
||||||
using const_buffers_type =
|
using const_buffers_type =
|
||||||
boost::asio::null_buffers;
|
boost::asio::const_buffer;
|
||||||
|
|
||||||
template<bool isRequest, class Fields>
|
template<bool isRequest, class Fields>
|
||||||
explicit
|
explicit
|
||||||
|
@@ -124,8 +124,8 @@ operator()(error_code ec, std::size_t)
|
|||||||
}
|
}
|
||||||
|
|
||||||
do_read:
|
do_read:
|
||||||
return s_.async_read_some(
|
return s_.async_wait(
|
||||||
boost::asio::null_buffers{},
|
boost::asio::ip::tcp::socket::wait_read,
|
||||||
std::move(*this));
|
std::move(*this));
|
||||||
}
|
}
|
||||||
if(role_ == role_type::client)
|
if(role_ == role_type::client)
|
||||||
|
@@ -131,14 +131,14 @@ public:
|
|||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
void testNullBuffers()
|
void testEmptyBuffers()
|
||||||
{
|
{
|
||||||
using boost::asio::buffer_copy;
|
using boost::asio::buffer_copy;
|
||||||
using boost::asio::buffer_size;
|
using boost::asio::buffer_size;
|
||||||
using boost::asio::null_buffers;
|
using boost::asio::mutable_buffer;
|
||||||
auto pb0 = buffers_prefix(0, null_buffers{});
|
auto pb0 = buffers_prefix(0, mutable_buffer{});
|
||||||
BEAST_EXPECT(buffer_size(pb0) == 0);
|
BEAST_EXPECT(buffer_size(pb0) == 0);
|
||||||
auto pb1 = buffers_prefix(1, null_buffers{});
|
auto pb1 = buffers_prefix(1, mutable_buffer{});
|
||||||
BEAST_EXPECT(buffer_size(pb1) == 0);
|
BEAST_EXPECT(buffer_size(pb1) == 0);
|
||||||
BEAST_EXPECT(buffer_copy(pb0, pb1) == 0);
|
BEAST_EXPECT(buffer_copy(pb0, pb1) == 0);
|
||||||
|
|
||||||
@@ -175,7 +175,7 @@ public:
|
|||||||
{
|
{
|
||||||
testMatrix<boost::asio::const_buffer>();
|
testMatrix<boost::asio::const_buffer>();
|
||||||
testMatrix<boost::asio::mutable_buffer>();
|
testMatrix<boost::asio::mutable_buffer>();
|
||||||
testNullBuffers();
|
testEmptyBuffers();
|
||||||
testIterator();
|
testIterator();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@@ -143,16 +143,16 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
testNullBuffers()
|
testEmptyBuffers()
|
||||||
{
|
{
|
||||||
using boost::asio::buffer_copy;
|
using boost::asio::buffer_copy;
|
||||||
using boost::asio::buffer_size;
|
using boost::asio::buffer_size;
|
||||||
using boost::asio::null_buffers;
|
using boost::asio::mutable_buffer;
|
||||||
buffers_suffix<null_buffers> cb(
|
buffers_suffix<mutable_buffer> cb(
|
||||||
null_buffers{});
|
mutable_buffer{});
|
||||||
BEAST_EXPECT(buffer_size(cb) == 0);
|
BEAST_EXPECT(buffer_size(cb) == 0);
|
||||||
buffers_suffix<null_buffers> cb2(
|
buffers_suffix<mutable_buffer> cb2(
|
||||||
null_buffers{});
|
mutable_buffer{});
|
||||||
BEAST_EXPECT(buffer_copy(cb2, cb) == 0);
|
BEAST_EXPECT(buffer_copy(cb2, cb) == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,7 +174,7 @@ public:
|
|||||||
testMatrix();
|
testMatrix();
|
||||||
testDefaultCtor();
|
testDefaultCtor();
|
||||||
testInPlace();
|
testInPlace();
|
||||||
testNullBuffers();
|
testEmptyBuffers();
|
||||||
testIterator();
|
testIterator();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@@ -66,7 +66,7 @@ public:
|
|||||||
doTest(pmd, [&](ws_type& ws)
|
doTest(pmd, [&](ws_type& ws)
|
||||||
{
|
{
|
||||||
ws.text(true);
|
ws.text(true);
|
||||||
w.write(ws, boost::asio::null_buffers{});
|
w.write(ws, boost::asio::const_buffer{});
|
||||||
multi_buffer b;
|
multi_buffer b;
|
||||||
w.read(ws, b);
|
w.read(ws, b);
|
||||||
BEAST_EXPECT(ws.got_text());
|
BEAST_EXPECT(ws.got_text());
|
||||||
@@ -549,7 +549,7 @@ public:
|
|||||||
if(! BEAST_EXPECTS(! ec, ec.message()))
|
if(! BEAST_EXPECTS(! ec, ec.message()))
|
||||||
break;
|
break;
|
||||||
ws.async_write_some(false,
|
ws.async_write_some(false,
|
||||||
boost::asio::null_buffers{},
|
boost::asio::const_buffer{},
|
||||||
[&](error_code, std::size_t)
|
[&](error_code, std::size_t)
|
||||||
{
|
{
|
||||||
fail();
|
fail();
|
||||||
|
Reference in New Issue
Block a user