Remove buffers_suffix::get (API Change):

* buffers_suffix::get member function is removed

Actions Required:

* Avoid calling buffers_suffix::get
This commit is contained in:
Vinnie Falco
2017-09-15 14:20:10 -07:00
parent 06fb2b9dfc
commit 2c656a22f9
4 changed files with 7 additions and 12 deletions

View File

@ -8,6 +8,7 @@ API Changes:
* buffers_front replaces buffer_front * buffers_front replaces buffer_front
* buffers_cat replaces buffer_cat * buffers_cat replaces buffer_cat
* buffers_cat_view replaces buffer_cat_view * buffers_cat_view replaces buffer_cat_view
* Remove buffers_suffix::get
Actions Required: Actions Required:
@ -17,6 +18,7 @@ Actions Required:
* Use buffers_front instead of buffer_front * Use buffers_front instead of buffer_front
* Use buffers_cat instead of buffer_cat * Use buffers_cat instead of buffer_cat
* Use buffers_cat_view instead of buffer_cat_view * Use buffers_cat_view instead of buffer_cat_view
* Avoid calling buffers_suffix::get
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

View File

@ -118,13 +118,6 @@ public:
/// Assignment /// Assignment
buffers_suffix& operator=(buffers_suffix const&); buffers_suffix& operator=(buffers_suffix const&);
/// Returns the underlying buffers, without modification
BufferSequence const&
get() const
{
return bs_;
}
/// Get a bidirectional iterator to the first element. /// Get a bidirectional iterator to the first element.
const_iterator const_iterator
begin() const; begin() const;

View File

@ -48,9 +48,8 @@ serializer<isRequest, Body, Fields>::
do_visit(error_code& ec, Visit& visit) do_visit(error_code& ec, Visit& visit)
{ {
pv_.template emplace<I>(limit_, v_.template get<I>()); pv_.template emplace<I>(limit_, v_.template get<I>());
visit(ec, visit(ec, beast::detail::make_buffers_ref(
beast::detail::make_buffers_ref( pv_.template get<I>()));
pv_.template get<I>()));
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -72,7 +71,6 @@ serializer<isRequest, Body, Fields>::
next(error_code& ec, Visit&& visit) next(error_code& ec, Visit&& visit)
{ {
using boost::asio::buffer_size; using boost::asio::buffer_size;
using beast::detail::make_buffers_ref;
switch(s_) switch(s_)
{ {
case do_construct: case do_construct:

View File

@ -47,6 +47,7 @@ class stream<NextLayer>::read_some_op
{ {
Handler h_; Handler h_;
stream<NextLayer>& ws_; stream<NextLayer>& ws_;
MutableBufferSequence bs_;
buffers_suffix<MutableBufferSequence> cb_; buffers_suffix<MutableBufferSequence> cb_;
std::size_t bytes_written_ = 0; std::size_t bytes_written_ = 0;
error_code ev_; error_code ev_;
@ -66,6 +67,7 @@ public:
MutableBufferSequence const& bs) MutableBufferSequence const& bs)
: h_(std::forward<DeducedHandler>(h)) : h_(std::forward<DeducedHandler>(h))
, ws_(ws) , ws_(ws)
, bs_(bs)
, cb_(bs) , cb_(bs)
, tok_(ws_.tok_.unique()) , tok_(ws_.tok_.unique())
, code_(close_code::none) , code_(close_code::none)
@ -556,7 +558,7 @@ operator()(
{ {
// check utf8 // check utf8
if(! ws_.rd_utf8_.write( if(! ws_.rd_utf8_.write(
buffers_prefix(bytes_written_, cb_.get())) || ( buffers_prefix(bytes_written_, bs_)) || (
ws_.rd_done_ && ! ws_.rd_utf8_.finish())) ws_.rd_done_ && ! ws_.rd_utf8_.finish()))
{ {
// _Fail the WebSocket Connection_ // _Fail the WebSocket Connection_