diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b0066d3..cd6b04b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ 1.0.0-b28 * Split out and rename test stream classes +* Restyle async result constructions -------------------------------------------------------------------------------- diff --git a/extras/beast/test/fail_stream.hpp b/extras/beast/test/fail_stream.hpp index fc656514..8ec63dc5 100644 --- a/extras/beast/test/fail_stream.hpp +++ b/extras/beast/test/fail_stream.hpp @@ -113,7 +113,7 @@ public: { async_completion< ReadHandler, void(error_code, std::size_t) - > completion(handler); + > completion{handler}; next_layer_.get_io_service().post( bind_handler(completion.handler, ec, 0)); return completion.result.get(); @@ -150,7 +150,7 @@ public: { async_completion< WriteHandler, void(error_code, std::size_t) - > completion(handler); + > completion{handler}; next_layer_.get_io_service().post( bind_handler(completion.handler, ec, 0)); return completion.result.get(); diff --git a/extras/beast/test/string_istream.hpp b/extras/beast/test/string_istream.hpp index 2ff07448..e7c32064 100644 --- a/extras/beast/test/string_istream.hpp +++ b/extras/beast/test/string_istream.hpp @@ -88,7 +88,7 @@ public: else ec = boost::asio::error::eof; async_completion completion(handler); + void(error_code, std::size_t)> completion{handler}; ios_.post(bind_handler( completion.handler, ec, n)); return completion.result.get(); @@ -120,7 +120,7 @@ public: WriteHandler&& handler) { async_completion completion(handler); + void(error_code, std::size_t)> completion{handler}; ios_.post(bind_handler(completion.handler, error_code{}, boost::asio::buffer_size(buffers))); return completion.result.get(); diff --git a/extras/beast/test/string_ostream.hpp b/extras/beast/test/string_ostream.hpp index 63a6f110..a939da7a 100644 --- a/extras/beast/test/string_ostream.hpp +++ b/extras/beast/test/string_ostream.hpp @@ -105,7 +105,7 @@ public: auto const bytes_transferred = write_some(buffers, ec); async_completion< WriteHandler, void(error_code, std::size_t) - > completion(handler); + > completion{handler}; get_io_service().post( bind_handler(completion.handler, ec, bytes_transferred)); return completion.result.get(); diff --git a/include/beast/core/async_completion.hpp b/include/beast/core/async_completion.hpp index 70c2e537..af5c67d2 100644 --- a/include/beast/core/async_completion.hpp +++ b/include/beast/core/async_completion.hpp @@ -38,7 +38,7 @@ namespace beast { async_initfn(..., CompletionHandler&& handler) { async_completion completion(handler); + void(error_code)> completion{handler}; ... return completion.result.get(); } diff --git a/include/beast/core/impl/dynabuf_readstream.ipp b/include/beast/core/impl/dynabuf_readstream.ipp index ba9e1c0b..5a0815ba 100644 --- a/include/beast/core/impl/dynabuf_readstream.ipp +++ b/include/beast/core/impl/dynabuf_readstream.ipp @@ -242,7 +242,7 @@ async_read_some( "MutableBufferSequence requirements not met"); beast::async_completion< ReadHandler, void(error_code, std::size_t) - > completion(handler); + > completion{handler}; read_some_op{ completion.handler, *this, buffers}; diff --git a/include/beast/http/impl/parse.ipp b/include/beast/http/impl/parse.ipp index 8f7d8171..17219fc3 100644 --- a/include/beast/http/impl/parse.ipp +++ b/include/beast/http/impl/parse.ipp @@ -289,7 +289,7 @@ async_parse(AsyncReadStream& stream, static_assert(is_Parser::value, "Parser requirements not met"); beast::async_completion completion(handler); + void(error_code)> completion{handler}; detail::parse_op{ completion.handler, stream, dynabuf, parser}; diff --git a/include/beast/http/impl/read.ipp b/include/beast/http/impl/read.ipp index 009ef7ca..3bcf27c7 100644 --- a/include/beast/http/impl/read.ipp +++ b/include/beast/http/impl/read.ipp @@ -183,7 +183,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf, static_assert(is_DynamicBuffer::value, "DynamicBuffer requirements not met"); beast::async_completion completion(handler); + void(error_code)> completion{handler}; detail::read_header_op{completion.handler, @@ -375,7 +375,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf, message>::value, "Reader requirements not met"); beast::async_completion completion(handler); + void(error_code)> completion{handler}; detail::read_op{completion.handler, diff --git a/include/beast/http/impl/write.ipp b/include/beast/http/impl/write.ipp index ed0a1aeb..7e97eebd 100644 --- a/include/beast/http/impl/write.ipp +++ b/include/beast/http/impl/write.ipp @@ -234,7 +234,7 @@ async_write(AsyncWriteStream& stream, static_assert(is_AsyncWriteStream::value, "AsyncWriteStream requirements not met"); beast::async_completion completion(handler); + void(error_code)> completion{handler}; streambuf sb; detail::write_start_line(sb, msg); detail::write_fields(sb, msg.fields); @@ -728,7 +728,7 @@ async_write(AsyncWriteStream& stream, message>::value, "Writer requirements not met"); beast::async_completion completion(handler); + void(error_code)> completion{handler}; detail::write_op{completion.handler, stream, msg}; return completion.result.get(); diff --git a/include/beast/websocket/impl/accept.ipp b/include/beast/websocket/impl/accept.ipp index 7be6d9cd..877be120 100644 --- a/include/beast/websocket/impl/accept.ipp +++ b/include/beast/websocket/impl/accept.ipp @@ -288,7 +288,7 @@ async_accept(ConstBufferSequence const& bs, AcceptHandler&& handler) "ConstBufferSequence requirements not met"); beast::async_completion< AcceptHandler, void(error_code) - > completion(handler); + > completion{handler}; accept_op{ completion.handler, *this, bs}; return completion.result.get(); @@ -306,7 +306,7 @@ async_accept(http::request const& req, "AsyncStream requirements requirements not met"); beast::async_completion< AcceptHandler, void(error_code) - > completion(handler); + > completion{handler}; reset(); response_op{ completion.handler, *this, req, diff --git a/include/beast/websocket/impl/close.ipp b/include/beast/websocket/impl/close.ipp index 7684904b..0ad5992b 100644 --- a/include/beast/websocket/impl/close.ipp +++ b/include/beast/websocket/impl/close.ipp @@ -197,7 +197,7 @@ async_close(close_reason const& cr, CloseHandler&& handler) "AsyncStream requirements not met"); beast::async_completion< CloseHandler, void(error_code) - > completion(handler); + > completion{handler}; close_op{ completion.handler, *this, cr}; return completion.result.get(); diff --git a/include/beast/websocket/impl/handshake.ipp b/include/beast/websocket/impl/handshake.ipp index a22a0567..11ea5618 100644 --- a/include/beast/websocket/impl/handshake.ipp +++ b/include/beast/websocket/impl/handshake.ipp @@ -158,7 +158,7 @@ async_handshake(boost::string_ref const& host, "AsyncStream requirements not met"); beast::async_completion< HandshakeHandler, void(error_code) - > completion(handler); + > completion{handler}; handshake_op{ completion.handler, *this, host, resource}; return completion.result.get(); diff --git a/include/beast/websocket/impl/ping.ipp b/include/beast/websocket/impl/ping.ipp index 0ddc4420..73990cce 100644 --- a/include/beast/websocket/impl/ping.ipp +++ b/include/beast/websocket/impl/ping.ipp @@ -195,7 +195,7 @@ async_ping(ping_data const& payload, WriteHandler&& handler) "AsyncStream requirements requirements not met"); beast::async_completion< WriteHandler, void(error_code) - > completion(handler); + > completion{handler}; ping_op{ completion.handler, *this, opcode::ping, payload}; @@ -213,7 +213,7 @@ async_pong(ping_data const& payload, WriteHandler&& handler) "AsyncStream requirements requirements not met"); beast::async_completion< WriteHandler, void(error_code) - > completion(handler); + > completion{handler}; ping_op{ completion.handler, *this, opcode::pong, payload}; diff --git a/include/beast/websocket/impl/read.ipp b/include/beast/websocket/impl/read.ipp index 2a9c6dec..6e65beea 100644 --- a/include/beast/websocket/impl/read.ipp +++ b/include/beast/websocket/impl/read.ipp @@ -673,7 +673,7 @@ async_read_frame(frame_info& fi, static_assert(beast::is_DynamicBuffer::value, "DynamicBuffer requirements not met"); beast::async_completion< - ReadHandler, void(error_code)> completion(handler); + ReadHandler, void(error_code)> completion{handler}; read_frame_op{ completion.handler, *this, fi, dynabuf}; return completion.result.get(); @@ -1079,7 +1079,7 @@ async_read(opcode& op, "DynamicBuffer requirements not met"); beast::async_completion< ReadHandler, void(error_code) - > completion(handler); + > completion{handler}; read_op{ completion.handler, *this, op, dynabuf}; return completion.result.get(); diff --git a/include/beast/websocket/impl/write.ipp b/include/beast/websocket/impl/write.ipp index 77136d71..a278bbd5 100644 --- a/include/beast/websocket/impl/write.ipp +++ b/include/beast/websocket/impl/write.ipp @@ -516,7 +516,7 @@ async_write_frame(bool fin, "ConstBufferSequence requirements not met"); beast::async_completion< WriteHandler, void(error_code) - > completion(handler); + > completion{handler}; write_frame_op{completion.handler, *this, fin, bs}; @@ -864,7 +864,7 @@ async_write(ConstBufferSequence const& bs, WriteHandler&& handler) ConstBufferSequence>::value, "ConstBufferSequence requirements not met"); beast::async_completion< - WriteHandler, void(error_code)> completion(handler); + WriteHandler, void(error_code)> completion{handler}; write_op{ completion.handler, *this, bs}; return completion.result.get();