Replace asynchronous helper macros with template aliases (API Change)

This commit is contained in:
Vinnie Falco committed 2017-07-20 08:12:16 -07:00
1 parent 043386aeb3
commit aa8a0a2a4b
20 files changed
+207 -189

No files matched your search

+20 -20
View File
@@ -575,8 +575,8 @@ template<
class DynamicBuffer,
bool isRequest, class Derived,
class ReadHandler>
BEAST_INITFN_RESULT_TYPE(
ReadHandler, void(error_code, std::size_t))
async_return_type<
ReadHandler, void(error_code, std::size_t)>
async_read_some(
AsyncReadStream& stream,
DynamicBuffer& dynabuf,
@@ -590,15 +590,15 @@ async_read_some(
case parse_state::header:
case parse_state::chunk_header:
detail::read_some_buffer_op<AsyncReadStream,
DynamicBuffer, isRequest, true, Derived, BEAST_HANDLER_TYPE(
ReadHandler, void(error_code, std::size_t))>{
DynamicBuffer, isRequest, true, Derived, handler_type<
ReadHandler, void(error_code, std::size_t)>>{
init.completion_handler, stream, dynabuf, parser};
break;
default:
detail::read_some_body_op<AsyncReadStream,
DynamicBuffer, isRequest, Derived, BEAST_HANDLER_TYPE(
ReadHandler, void(error_code, std::size_t))>{
DynamicBuffer, isRequest, Derived, handler_type<
ReadHandler, void(error_code, std::size_t)>>{
init.completion_handler, stream, dynabuf, parser};
break;
}
@@ -611,8 +611,8 @@ template<
bool isRequest, class Derived,
class ReadHandler>
inline
BEAST_INITFN_RESULT_TYPE(
ReadHandler, void(error_code, std::size_t))
async_return_type<
ReadHandler, void(error_code, std::size_t)>
async_read_some(
AsyncReadStream& stream,
DynamicBuffer& dynabuf,
@@ -622,8 +622,8 @@ async_read_some(
async_completion<ReadHandler,
void(error_code, std::size_t)> init{handler};
detail::read_some_buffer_op<AsyncReadStream,
DynamicBuffer, isRequest, false, Derived, BEAST_HANDLER_TYPE(
ReadHandler, void(error_code, std::size_t))>{
DynamicBuffer, isRequest, false, Derived, handler_type<
ReadHandler, void(error_code, std::size_t)>>{
init.completion_handler, stream, dynabuf, parser};
return init.result.get();
}
@@ -637,8 +637,8 @@ template<
class DynamicBuffer,
bool isRequest, bool isDirect, class Derived,
class ReadHandler>
BEAST_INITFN_RESULT_TYPE(
ReadHandler, void(error_code, std::size_t))
async_return_type<
ReadHandler, void(error_code, std::size_t)>
async_read_some(
AsyncReadStream& stream,
DynamicBuffer& dynabuf,
@@ -659,8 +659,8 @@ template<
class DynamicBuffer,
bool isRequest, bool isDirect, class Derived,
class ReadHandler>
BEAST_INITFN_RESULT_TYPE(
ReadHandler, void(error_code))
async_return_type<
ReadHandler, void(error_code)>
async_read(
AsyncReadStream& stream,
DynamicBuffer& dynabuf,
@@ -675,8 +675,8 @@ async_read(
async_completion<ReadHandler,
void(error_code)> init{handler};
detail::parse_op<AsyncReadStream, DynamicBuffer,
isRequest, isDirect, Derived, BEAST_HANDLER_TYPE(
ReadHandler, void(error_code))>{
isRequest, isDirect, Derived, handler_type<
ReadHandler, void(error_code)>>{
init.completion_handler, stream, dynabuf, parser};
return init.result.get();
}
@@ -686,8 +686,8 @@ template<
class DynamicBuffer,
bool isRequest, class Body, class Fields,
class ReadHandler>
BEAST_INITFN_RESULT_TYPE(
ReadHandler, void(error_code))
async_return_type<
ReadHandler, void(error_code)>
async_read(
AsyncReadStream& stream,
DynamicBuffer& dynabuf,
@@ -708,8 +708,8 @@ async_read(
async_completion<ReadHandler,
void(error_code)> init{handler};
detail::read_message_op<AsyncReadStream, DynamicBuffer,
isRequest, Body, Fields, BEAST_HANDLER_TYPE(
ReadHandler, void(error_code))>{
isRequest, Body, Fields, handler_type<
ReadHandler, void(error_code)>>{
init.completion_handler, stream, dynabuf, msg};
return init.result.get();
}
+7 -7
View File
@@ -213,8 +213,8 @@ write(SyncWriteStream& stream,
template<class AsyncWriteStream,
bool isRequest, class Fields,
class WriteHandler>
BEAST_INITFN_RESULT_TYPE(
WriteHandler, void(error_code))
async_return_type<
WriteHandler, void(error_code)>
async_write(AsyncWriteStream& stream,
header<isRequest, Fields> const& msg,
WriteHandler&& handler)
@@ -231,7 +231,7 @@ async_write(AsyncWriteStream& stream,
os << "\r\n";
}
detail::write_streambuf_op<AsyncWriteStream,
BEAST_HANDLER_TYPE(WriteHandler, void(error_code))>{
handler_type<WriteHandler, void(error_code)>>{
init.completion_handler, stream, std::move(b)};
return init.result.get();
}
@@ -641,8 +641,8 @@ write(SyncWriteStream& stream,
template<class AsyncWriteStream,
bool isRequest, class Body, class Fields,
class WriteHandler>
BEAST_INITFN_RESULT_TYPE(
WriteHandler, void(error_code))
async_return_type<
WriteHandler, void(error_code)>
async_write(AsyncWriteStream& stream,
message<isRequest, Body, Fields> const& msg,
WriteHandler&& handler)
@@ -658,8 +658,8 @@ async_write(AsyncWriteStream& stream,
"Writer requirements not met");
async_completion<WriteHandler,
void(error_code)> init{handler};
detail::write_op<AsyncWriteStream, BEAST_HANDLER_TYPE(
WriteHandler, void(error_code)), isRequest,
detail::write_op<AsyncWriteStream, handler_type<
WriteHandler, void(error_code)>, isRequest,
Body, Fields>{init.completion_handler, stream, msg};
return init.result.get();
}