From 4fbb0079c34e1e42e6d7527fd927163b3d2413de Mon Sep 17 00:00:00 2001 From: Richard Hodges Date: Tue, 2 Jun 2020 15:26:57 +0200 Subject: [PATCH] Remove mutable_data_type from Dyanmic Buffers (API Change): API Changes: * Code that depends on mutable_data_type should be refactored to use mutable_buffers_type. Classes affected are: - buffers_adaptor - flat_buffer - flat_static_buffer - multi_buffer - static_buffer refs #1934 --- CHANGELOG.md | 9 +++++++++ include/boost/beast/core/buffers_adaptor.hpp | 4 ---- include/boost/beast/core/flat_buffer.hpp | 2 -- include/boost/beast/core/flat_static_buffer.hpp | 4 ---- include/boost/beast/core/multi_buffer.hpp | 5 ----- include/boost/beast/core/static_buffer.hpp | 4 ---- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f5268cc..2c5bfad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +* Remove `mutable_data_type` from Dyanmic Buffers (API Change) * Remove deprecated lowest_layer from test::stream * Remove handler_pointer (API Change) * Remove websocket::role_type (API Change) @@ -6,6 +7,14 @@ API Changes: +* Code that depends on `mutable_data_type` should be refactored to use + `mutable_buffers_type`. Classes affected are: + - `buffers_adaptor` + - `flat_buffer` + - `flat_static_buffer` + - `multi_buffer` + - `static_buffer` + * handler_ptr has been removed. Users should use net::bind_handler and/or bind_front_handler instead. diff --git a/include/boost/beast/core/buffers_adaptor.hpp b/include/boost/beast/core/buffers_adaptor.hpp index 0485d379..b8e5ce30 100644 --- a/include/boost/beast/core/buffers_adaptor.hpp +++ b/include/boost/beast/core/buffers_adaptor.hpp @@ -112,10 +112,6 @@ public: #else using const_buffers_type = subrange; -#ifdef BOOST_BEAST_ALLOW_DEPRECATED - using mutable_data_type = subrange; -#endif - using mutable_buffers_type = subrange; #endif diff --git a/include/boost/beast/core/flat_buffer.hpp b/include/boost/beast/core/flat_buffer.hpp index ec0f63ec..550e4414 100644 --- a/include/boost/beast/core/flat_buffer.hpp +++ b/include/boost/beast/core/flat_buffer.hpp @@ -396,8 +396,6 @@ public: /// The ConstBufferSequence used to represent the readable bytes. using const_buffers_type = net::const_buffer; - using mutable_data_type = net::mutable_buffer; - /// The MutableBufferSequence used to represent the writable bytes. using mutable_buffers_type = net::mutable_buffer; diff --git a/include/boost/beast/core/flat_static_buffer.hpp b/include/boost/beast/core/flat_static_buffer.hpp index eae4be47..7a3aa9b6 100644 --- a/include/boost/beast/core/flat_static_buffer.hpp +++ b/include/boost/beast/core/flat_static_buffer.hpp @@ -114,10 +114,6 @@ public: /// The ConstBufferSequence used to represent the readable bytes. using const_buffers_type = net::const_buffer; -#ifdef BOOST_BEAST_ALLOW_DEPRECATED - using mutable_data_type = net::mutable_buffer; -#endif - /// The MutableBufferSequence used to represent the writable bytes. using mutable_buffers_type = net::mutable_buffer; diff --git a/include/boost/beast/core/multi_buffer.hpp b/include/boost/beast/core/multi_buffer.hpp index c58c2e3b..f77a0af1 100644 --- a/include/boost/beast/core/multi_buffer.hpp +++ b/include/boost/beast/core/multi_buffer.hpp @@ -166,11 +166,6 @@ public: using const_buffers_type = subrange; using mutable_buffers_type = subrange; - -#ifdef BOOST_BEAST_ALLOW_DEPRECATED - using mutable_data_type = subrange; -#endif - #endif /// The type of allocator used. diff --git a/include/boost/beast/core/static_buffer.hpp b/include/boost/beast/core/static_buffer.hpp index fd6c7f07..3325f592 100644 --- a/include/boost/beast/core/static_buffer.hpp +++ b/include/boost/beast/core/static_buffer.hpp @@ -99,10 +99,6 @@ public: #else using const_buffers_type = detail::buffers_pair; -#ifdef BOOST_BEAST_ALLOW_DEPRECATED - using mutable_data_type = detail::buffers_pair; -#endif - using mutable_buffers_type = detail::buffers_pair; #endif