boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-31 21:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

null_buffers is deprecated

Browse Source
This commit is contained in:
Vinnie Falco
2017-11-20 11:48:57 -08:00
parent 75fcea69ee
commit 110a0d52e2
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -3,6 +3,7 @@ Version 145:
* Rename some detail functions
* Refactor basic_fields allocator internals
* Refactor HTTP async read composed operations
* null_buffers is deprecated
--------------------------------------------------------------------------------

2
include/boost/beast/http/empty_body.hpp
View File

@@ -100,7 +100,7 @@ struct empty_body
struct writer
{
using const_buffers_type =
boost::asio::null_buffers;
boost::asio::const_buffer;
template<bool isRequest, class Fields>
explicit

4
include/boost/beast/websocket/impl/teardown.ipp
View File

@@ -124,8 +124,8 @@ operator()(error_code ec, std::size_t)
}
do_read:
return s_.async_read_some(
boost::asio::null_buffers{},
return s_.async_wait(
boost::asio::ip::tcp::socket::wait_read,
std::move(*this));
}
if(role_ == role_type::client)

10
test/beast/core/buffers_prefix.cpp
View File

@@ -131,14 +131,14 @@ public:
}}
}
void testNullBuffers()
void testEmptyBuffers()
{
using boost::asio::buffer_copy;
using boost::asio::buffer_size;
using boost::asio::null_buffers;
auto pb0 = buffers_prefix(0, null_buffers{});
using boost::asio::mutable_buffer;
auto pb0 = buffers_prefix(0, mutable_buffer{});
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_copy(pb0, pb1) == 0);
@@ -175,7 +175,7 @@ public:
{
testMatrix<boost::asio::const_buffer>();
testMatrix<boost::asio::mutable_buffer>();
testNullBuffers();
testEmptyBuffers();
testIterator();
}
};

14
test/beast/core/buffers_suffix.cpp
View File

@@ -143,16 +143,16 @@ public:
}
void
testNullBuffers()
testEmptyBuffers()
{
using boost::asio::buffer_copy;
using boost::asio::buffer_size;
using boost::asio::null_buffers;
buffers_suffix<null_buffers> cb(
null_buffers{});
using boost::asio::mutable_buffer;
buffers_suffix<mutable_buffer> cb(
mutable_buffer{});
BEAST_EXPECT(buffer_size(cb) == 0);
buffers_suffix<null_buffers> cb2(
null_buffers{});
buffers_suffix<mutable_buffer> cb2(
mutable_buffer{});
BEAST_EXPECT(buffer_copy(cb2, cb) == 0);
}
@@ -174,7 +174,7 @@ public:
testMatrix();
testDefaultCtor();
testInPlace();
testNullBuffers();
testEmptyBuffers();
testIterator();
}
};

4
test/beast/websocket/write.cpp
View File

@@ -66,7 +66,7 @@ public:
doTest(pmd, [&](ws_type& ws)
{
ws.text(true);
w.write(ws, boost::asio::null_buffers{});
w.write(ws, boost::asio::const_buffer{});
multi_buffer b;
w.read(ws, b);
BEAST_EXPECT(ws.got_text());
@@ -549,7 +549,7 @@ public:
if(! BEAST_EXPECTS(! ec, ec.message()))
break;
ws.async_write_some(false,
boost::asio::null_buffers{},
boost::asio::const_buffer{},
[&](error_code, std::size_t)
{
fail();