From 2c656a22f9846b91ca0d245dbb26b6bc7deefc69 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 15 Sep 2017 14:20:10 -0700 Subject: [PATCH] Remove buffers_suffix::get (API Change): * buffers_suffix::get member function is removed Actions Required: * Avoid calling buffers_suffix::get --- CHANGELOG.md | 2 ++ include/boost/beast/core/buffers_suffix.hpp | 7 ------- include/boost/beast/http/impl/serializer.ipp | 6 ++---- include/boost/beast/websocket/impl/read.ipp | 4 +++- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e10a6af3..a88d89b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ API Changes: * buffers_front replaces buffer_front * buffers_cat replaces buffer_cat * buffers_cat_view replaces buffer_cat_view +* Remove buffers_suffix::get Actions Required: @@ -17,6 +18,7 @@ Actions Required: * Use buffers_front instead of buffer_front * Use buffers_cat instead of buffer_cat * Use buffers_cat_view instead of buffer_cat_view +* Avoid calling buffers_suffix::get -------------------------------------------------------------------------------- diff --git a/include/boost/beast/core/buffers_suffix.hpp b/include/boost/beast/core/buffers_suffix.hpp index a04e13ad..d182d6e8 100644 --- a/include/boost/beast/core/buffers_suffix.hpp +++ b/include/boost/beast/core/buffers_suffix.hpp @@ -118,13 +118,6 @@ public: /// Assignment 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. const_iterator begin() const; diff --git a/include/boost/beast/http/impl/serializer.ipp b/include/boost/beast/http/impl/serializer.ipp index befd62ca..c6d0be86 100644 --- a/include/boost/beast/http/impl/serializer.ipp +++ b/include/boost/beast/http/impl/serializer.ipp @@ -48,9 +48,8 @@ serializer:: do_visit(error_code& ec, Visit& visit) { pv_.template emplace(limit_, v_.template get()); - visit(ec, - beast::detail::make_buffers_ref( - pv_.template get())); + visit(ec, beast::detail::make_buffers_ref( + pv_.template get())); } //------------------------------------------------------------------------------ @@ -72,7 +71,6 @@ serializer:: next(error_code& ec, Visit&& visit) { using boost::asio::buffer_size; - using beast::detail::make_buffers_ref; switch(s_) { case do_construct: diff --git a/include/boost/beast/websocket/impl/read.ipp b/include/boost/beast/websocket/impl/read.ipp index 18f55224..8663a9d2 100644 --- a/include/boost/beast/websocket/impl/read.ipp +++ b/include/boost/beast/websocket/impl/read.ipp @@ -47,6 +47,7 @@ class stream::read_some_op { Handler h_; stream& ws_; + MutableBufferSequence bs_; buffers_suffix cb_; std::size_t bytes_written_ = 0; error_code ev_; @@ -66,6 +67,7 @@ public: MutableBufferSequence const& bs) : h_(std::forward(h)) , ws_(ws) + , bs_(bs) , cb_(bs) , tok_(ws_.tok_.unique()) , code_(close_code::none) @@ -556,7 +558,7 @@ operator()( { // check utf8 if(! ws_.rd_utf8_.write( - buffers_prefix(bytes_written_, cb_.get())) || ( + buffers_prefix(bytes_written_, bs_)) || ( ws_.rd_done_ && ! ws_.rd_utf8_.finish())) { // _Fail the WebSocket Connection_