Restyle async result constructions

This commit is contained in:
Vinnie Falco
2017-01-09 11:25:34 -05:00
parent 1f52f4a791
commit dbfb7718fc
15 changed files with 23 additions and 22 deletions

View File

@ -1,6 +1,7 @@
1.0.0-b28 1.0.0-b28
* Split out and rename test stream classes * Split out and rename test stream classes
* Restyle async result constructions
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

View File

@ -113,7 +113,7 @@ public:
{ {
async_completion< async_completion<
ReadHandler, void(error_code, std::size_t) ReadHandler, void(error_code, std::size_t)
> completion(handler); > completion{handler};
next_layer_.get_io_service().post( next_layer_.get_io_service().post(
bind_handler(completion.handler, ec, 0)); bind_handler(completion.handler, ec, 0));
return completion.result.get(); return completion.result.get();
@ -150,7 +150,7 @@ public:
{ {
async_completion< async_completion<
WriteHandler, void(error_code, std::size_t) WriteHandler, void(error_code, std::size_t)
> completion(handler); > completion{handler};
next_layer_.get_io_service().post( next_layer_.get_io_service().post(
bind_handler(completion.handler, ec, 0)); bind_handler(completion.handler, ec, 0));
return completion.result.get(); return completion.result.get();

View File

@ -88,7 +88,7 @@ public:
else else
ec = boost::asio::error::eof; ec = boost::asio::error::eof;
async_completion<ReadHandler, async_completion<ReadHandler,
void(error_code, std::size_t)> completion(handler); void(error_code, std::size_t)> completion{handler};
ios_.post(bind_handler( ios_.post(bind_handler(
completion.handler, ec, n)); completion.handler, ec, n));
return completion.result.get(); return completion.result.get();
@ -120,7 +120,7 @@ public:
WriteHandler&& handler) WriteHandler&& handler)
{ {
async_completion<WriteHandler, async_completion<WriteHandler,
void(error_code, std::size_t)> completion(handler); void(error_code, std::size_t)> completion{handler};
ios_.post(bind_handler(completion.handler, ios_.post(bind_handler(completion.handler,
error_code{}, boost::asio::buffer_size(buffers))); error_code{}, boost::asio::buffer_size(buffers)));
return completion.result.get(); return completion.result.get();

View File

@ -105,7 +105,7 @@ public:
auto const bytes_transferred = write_some(buffers, ec); auto const bytes_transferred = write_some(buffers, ec);
async_completion< async_completion<
WriteHandler, void(error_code, std::size_t) WriteHandler, void(error_code, std::size_t)
> completion(handler); > completion{handler};
get_io_service().post( get_io_service().post(
bind_handler(completion.handler, ec, bytes_transferred)); bind_handler(completion.handler, ec, bytes_transferred));
return completion.result.get(); return completion.result.get();

View File

@ -38,7 +38,7 @@ namespace beast {
async_initfn(..., CompletionHandler&& handler) async_initfn(..., CompletionHandler&& handler)
{ {
async_completion<CompletionHandler, async_completion<CompletionHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
... ...
return completion.result.get(); return completion.result.get();
} }

View File

@ -242,7 +242,7 @@ async_read_some(
"MutableBufferSequence requirements not met"); "MutableBufferSequence requirements not met");
beast::async_completion< beast::async_completion<
ReadHandler, void(error_code, std::size_t) ReadHandler, void(error_code, std::size_t)
> completion(handler); > completion{handler};
read_some_op<MutableBufferSequence, read_some_op<MutableBufferSequence,
decltype(completion.handler)>{ decltype(completion.handler)>{
completion.handler, *this, buffers}; completion.handler, *this, buffers};

View File

@ -289,7 +289,7 @@ async_parse(AsyncReadStream& stream,
static_assert(is_Parser<Parser>::value, static_assert(is_Parser<Parser>::value,
"Parser requirements not met"); "Parser requirements not met");
beast::async_completion<ReadHandler, beast::async_completion<ReadHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
detail::parse_op<AsyncReadStream, DynamicBuffer, detail::parse_op<AsyncReadStream, DynamicBuffer,
Parser, decltype(completion.handler)>{ Parser, decltype(completion.handler)>{
completion.handler, stream, dynabuf, parser}; completion.handler, stream, dynabuf, parser};

View File

@ -183,7 +183,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf,
static_assert(is_DynamicBuffer<DynamicBuffer>::value, static_assert(is_DynamicBuffer<DynamicBuffer>::value,
"DynamicBuffer requirements not met"); "DynamicBuffer requirements not met");
beast::async_completion<ReadHandler, beast::async_completion<ReadHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
detail::read_header_op<AsyncReadStream, DynamicBuffer, detail::read_header_op<AsyncReadStream, DynamicBuffer,
isRequest, Fields, decltype( isRequest, Fields, decltype(
completion.handler)>{completion.handler, completion.handler)>{completion.handler,
@ -375,7 +375,7 @@ async_read(AsyncReadStream& stream, DynamicBuffer& dynabuf,
message<isRequest, Body, Fields>>::value, message<isRequest, Body, Fields>>::value,
"Reader requirements not met"); "Reader requirements not met");
beast::async_completion<ReadHandler, beast::async_completion<ReadHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
detail::read_op<AsyncReadStream, DynamicBuffer, detail::read_op<AsyncReadStream, DynamicBuffer,
isRequest, Body, Fields, decltype( isRequest, Body, Fields, decltype(
completion.handler)>{completion.handler, completion.handler)>{completion.handler,

View File

@ -234,7 +234,7 @@ async_write(AsyncWriteStream& stream,
static_assert(is_AsyncWriteStream<AsyncWriteStream>::value, static_assert(is_AsyncWriteStream<AsyncWriteStream>::value,
"AsyncWriteStream requirements not met"); "AsyncWriteStream requirements not met");
beast::async_completion<WriteHandler, beast::async_completion<WriteHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
streambuf sb; streambuf sb;
detail::write_start_line(sb, msg); detail::write_start_line(sb, msg);
detail::write_fields(sb, msg.fields); detail::write_fields(sb, msg.fields);
@ -728,7 +728,7 @@ async_write(AsyncWriteStream& stream,
message<isRequest, Body, Fields>>::value, message<isRequest, Body, Fields>>::value,
"Writer requirements not met"); "Writer requirements not met");
beast::async_completion<WriteHandler, beast::async_completion<WriteHandler,
void(error_code)> completion(handler); void(error_code)> completion{handler};
detail::write_op<AsyncWriteStream, decltype(completion.handler), detail::write_op<AsyncWriteStream, decltype(completion.handler),
isRequest, Body, Fields>{completion.handler, stream, msg}; isRequest, Body, Fields>{completion.handler, stream, msg};
return completion.result.get(); return completion.result.get();

View File

@ -288,7 +288,7 @@ async_accept(ConstBufferSequence const& bs, AcceptHandler&& handler)
"ConstBufferSequence requirements not met"); "ConstBufferSequence requirements not met");
beast::async_completion< beast::async_completion<
AcceptHandler, void(error_code) AcceptHandler, void(error_code)
> completion(handler); > completion{handler};
accept_op<decltype(completion.handler)>{ accept_op<decltype(completion.handler)>{
completion.handler, *this, bs}; completion.handler, *this, bs};
return completion.result.get(); return completion.result.get();
@ -306,7 +306,7 @@ async_accept(http::request<Body, Fields> const& req,
"AsyncStream requirements requirements not met"); "AsyncStream requirements requirements not met");
beast::async_completion< beast::async_completion<
AcceptHandler, void(error_code) AcceptHandler, void(error_code)
> completion(handler); > completion{handler};
reset(); reset();
response_op<decltype(completion.handler)>{ response_op<decltype(completion.handler)>{
completion.handler, *this, req, completion.handler, *this, req,

View File

@ -197,7 +197,7 @@ async_close(close_reason const& cr, CloseHandler&& handler)
"AsyncStream requirements not met"); "AsyncStream requirements not met");
beast::async_completion< beast::async_completion<
CloseHandler, void(error_code) CloseHandler, void(error_code)
> completion(handler); > completion{handler};
close_op<decltype(completion.handler)>{ close_op<decltype(completion.handler)>{
completion.handler, *this, cr}; completion.handler, *this, cr};
return completion.result.get(); return completion.result.get();

View File

@ -158,7 +158,7 @@ async_handshake(boost::string_ref const& host,
"AsyncStream requirements not met"); "AsyncStream requirements not met");
beast::async_completion< beast::async_completion<
HandshakeHandler, void(error_code) HandshakeHandler, void(error_code)
> completion(handler); > completion{handler};
handshake_op<decltype(completion.handler)>{ handshake_op<decltype(completion.handler)>{
completion.handler, *this, host, resource}; completion.handler, *this, host, resource};
return completion.result.get(); return completion.result.get();

View File

@ -195,7 +195,7 @@ async_ping(ping_data const& payload, WriteHandler&& handler)
"AsyncStream requirements requirements not met"); "AsyncStream requirements requirements not met");
beast::async_completion< beast::async_completion<
WriteHandler, void(error_code) WriteHandler, void(error_code)
> completion(handler); > completion{handler};
ping_op<decltype(completion.handler)>{ ping_op<decltype(completion.handler)>{
completion.handler, *this, completion.handler, *this,
opcode::ping, payload}; opcode::ping, payload};
@ -213,7 +213,7 @@ async_pong(ping_data const& payload, WriteHandler&& handler)
"AsyncStream requirements requirements not met"); "AsyncStream requirements requirements not met");
beast::async_completion< beast::async_completion<
WriteHandler, void(error_code) WriteHandler, void(error_code)
> completion(handler); > completion{handler};
ping_op<decltype(completion.handler)>{ ping_op<decltype(completion.handler)>{
completion.handler, *this, completion.handler, *this,
opcode::pong, payload}; opcode::pong, payload};

View File

@ -673,7 +673,7 @@ async_read_frame(frame_info& fi,
static_assert(beast::is_DynamicBuffer<DynamicBuffer>::value, static_assert(beast::is_DynamicBuffer<DynamicBuffer>::value,
"DynamicBuffer requirements not met"); "DynamicBuffer requirements not met");
beast::async_completion< beast::async_completion<
ReadHandler, void(error_code)> completion(handler); ReadHandler, void(error_code)> completion{handler};
read_frame_op<DynamicBuffer, decltype(completion.handler)>{ read_frame_op<DynamicBuffer, decltype(completion.handler)>{
completion.handler, *this, fi, dynabuf}; completion.handler, *this, fi, dynabuf};
return completion.result.get(); return completion.result.get();
@ -1079,7 +1079,7 @@ async_read(opcode& op,
"DynamicBuffer requirements not met"); "DynamicBuffer requirements not met");
beast::async_completion< beast::async_completion<
ReadHandler, void(error_code) ReadHandler, void(error_code)
> completion(handler); > completion{handler};
read_op<DynamicBuffer, decltype(completion.handler)>{ read_op<DynamicBuffer, decltype(completion.handler)>{
completion.handler, *this, op, dynabuf}; completion.handler, *this, op, dynabuf};
return completion.result.get(); return completion.result.get();

View File

@ -516,7 +516,7 @@ async_write_frame(bool fin,
"ConstBufferSequence requirements not met"); "ConstBufferSequence requirements not met");
beast::async_completion< beast::async_completion<
WriteHandler, void(error_code) WriteHandler, void(error_code)
> completion(handler); > completion{handler};
write_frame_op<ConstBufferSequence, decltype( write_frame_op<ConstBufferSequence, decltype(
completion.handler)>{completion.handler, completion.handler)>{completion.handler,
*this, fin, bs}; *this, fin, bs};
@ -864,7 +864,7 @@ async_write(ConstBufferSequence const& bs, WriteHandler&& handler)
ConstBufferSequence>::value, ConstBufferSequence>::value,
"ConstBufferSequence requirements not met"); "ConstBufferSequence requirements not met");
beast::async_completion< beast::async_completion<
WriteHandler, void(error_code)> completion(handler); WriteHandler, void(error_code)> completion{handler};
write_op<ConstBufferSequence, decltype(completion.handler)>{ write_op<ConstBufferSequence, decltype(completion.handler)>{
completion.handler, *this, bs}; completion.handler, *this, bs};
return completion.result.get(); return completion.result.get();