From c254b4fcfb687c3787b391ed9d3c9be48eb7cdfe Mon Sep 17 00:00:00 2001 From: Damian Jarek Date: Mon, 13 May 2019 00:07:03 +0200 Subject: [PATCH] Remove uses of the deprecated `buffers` function Fix: 1607 Close: 1608 Signed-off-by: Damian Jarek --- CHANGELOG.md | 6 ++++++ include/boost/beast/http/impl/write.hpp | 8 ++++---- test/doc/http_snippets.cpp | 10 +++++----- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f02a099..7e0bbee3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 256: + +* Remove uses of the deprecated `buffers` function + +-------------------------------------------------------------------------------- + Version 255: * Add idle ping suspend test diff --git a/include/boost/beast/http/impl/write.hpp b/include/boost/beast/http/impl/write.hpp index 5636ce92..02363bad 100644 --- a/include/boost/beast/http/impl/write.hpp +++ b/include/boost/beast/http/impl/write.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -262,7 +262,7 @@ struct run_write_some_op { template< class WriteHandler, - class Stream, + class Stream, bool isRequest, class Body, class Fields> void operator()( @@ -903,7 +903,7 @@ operator<<(std::ostream& os, { typename Fields::writer fr{ h, h.version(), h.method()}; - return os << buffers(fr.get()); + return os << beast::make_printable(fr.get()); } template @@ -913,7 +913,7 @@ operator<<(std::ostream& os, { typename Fields::writer fr{ h, h.version(), h.result_int()}; - return os << buffers(fr.get()); + return os << beast::make_printable(fr.get()); } template diff --git a/test/doc/http_snippets.cpp b/test/doc/http_snippets.cpp index f7fc4e30..92c846fd 100644 --- a/test/doc/http_snippets.cpp +++ b/test/doc/http_snippets.cpp @@ -366,7 +366,7 @@ print_cxx14(message const& m) [&sr](error_code& ec, auto const& buffer) { ec = {}; - std::cout << buffers(buffer); + std::cout << make_printable(buffer); sr.consume(buffer_bytes(buffer)); }); } @@ -393,7 +393,7 @@ struct lambda void operator()(error_code& ec, ConstBufferSequence const& buffer) const { ec = {}; - std::cout << buffers(buffer); + std::cout << make_printable(buffer); sr.consume(buffer_bytes(buffer)); } }; @@ -434,7 +434,7 @@ split_print_cxx14(message const& m) [&sr](error_code& ec, auto const& buffer) { ec = {}; - std::cout << buffers(buffer); + std::cout << make_printable(buffer); sr.consume(buffer_bytes(buffer)); }); } @@ -448,7 +448,7 @@ split_print_cxx14(message const& m) [&sr](error_code& ec, auto const& buffer) { ec = {}; - std::cout << buffers(buffer); + std::cout << make_printable(buffer); sr.consume(buffer_bytes(buffer)); }); } @@ -461,6 +461,6 @@ split_print_cxx14(message const& m) //] #endif -// Highest snippet: +// Highest snippet: } // doc_http_snippets