feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Doc tidy

Browse Source
This commit is contained in:
Vinnie Falco
2019-03-04 23:13:42 -08:00
parent 31331bbe4d
commit 8e2620e2b1
41 changed files with 171 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/qbk/03_core/_core.qbk
View File

@@ -15,8 +15,8 @@ scheduled to become an official part of C++ no sooner than the year
2023. Three implementations exist, with cosmetic differences but 2023. Three implementations exist, with cosmetic differences but
otherwise using the same function signatures and type declarations: otherwise using the same function signatures and type declarations:
Boost.Asio, stand-alone Asio, and networking-ts-impl. This table shows Boost.Asio, stand-alone Asio, and networking-ts-impl. This table shows
how a variable of the each library's `io_context` type is declared by how a variable of type `io_context` is declared in each implementation
including the appropriate header and using a suitable namespace alias: by including the appropriate header and using a suitable namespace alias:
[table Networking Implementations [table Networking Implementations
[[Name][Namespace and Header Example ]] [[Name][Namespace and Header Example ]]

1
doc/qbk/main.qbk
View File

@@ -87,6 +87,7 @@
[def __Body__ [link beast.concepts.Body ['Body]]] [def __Body__ [link beast.concepts.Body ['Body]]]
[def __BodyReader__ [link beast.concepts.BodyReader ['BodyReader]]] [def __BodyReader__ [link beast.concepts.BodyReader ['BodyReader]]]
[def __BodyWriter__ [link beast.concepts.BodyWriter ['BodyWriter]]] [def __BodyWriter__ [link beast.concepts.BodyWriter ['BodyWriter]]]
[def __BufferSequence__ [link beast.concepts.BufferSequence ['BufferSequence]]]
[def __DynamicBuffer__ [link beast.concepts.DynamicBuffer ['DynamicBuffer]]] [def __DynamicBuffer__ [link beast.concepts.DynamicBuffer ['DynamicBuffer]]]
[def __Fields__ [link beast.concepts.Fields ['Fields]]] [def __Fields__ [link beast.concepts.Fields ['Fields]]]
[def __FieldsWriter__ [link beast.concepts.FieldsWriter ['FieldsWriter]]] [def __FieldsWriter__ [link beast.concepts.FieldsWriter ['FieldsWriter]]]

106
doc/source.dox
View File

@@ -1,3 +1,57 @@
#---------------------------------------------------------------------------
# Configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = \
$(LIB_DIR)/include/boost/beast/ \
$(LIB_DIR)/include/boost/beast/_experimental/http \
$(LIB_DIR)/include/boost/beast/_experimental/test \
$(LIB_DIR)/include/boost/beast/core \
$(LIB_DIR)/include/boost/beast/http \
$(LIB_DIR)/include/boost/beast/ssl \
$(LIB_DIR)/include/boost/beast/websocket \
$(LIB_DIR)/include/boost/beast/zlib
INPUT_ENCODING = UTF-8
FILE_PATTERNS =
RECURSIVE = NO
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
FILTER_SOURCE_PATTERNS =
USE_MDFILE_AS_MAINPAGE =
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
INCLUDE_PATH = ../
INCLUDE_FILE_PATTERNS =
PREDEFINED = \
BOOST_BEAST_DOXYGEN \
BOOST_BEAST_USE_POSIX_FILE=1 \
BOOST_BEAST_USE_WIN32_FILE=1 \
BOOST_BEAST_SPLIT_COMPILATION=1 \
BOOST_BEAST_ASYNC_RESULT1(t)=__deduced__ \
BOOST_BEAST_ASYNC_RESULT1(t)=__deduced__ \
BOOST_ASIO_INITFN_RESULT_TYPE(t,a)=__deduced__ \
GENERATING_DOCUMENTATION \
BOOST_BEAST_DECL
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@@ -99,37 +153,6 @@ WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text" WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE = WARN_LOGFILE =
#---------------------------------------------------------------------------
# Configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = \
$(LIB_DIR)/include/boost/beast/ \
$(LIB_DIR)/include/boost/beast/_experimental/http \
$(LIB_DIR)/include/boost/beast/_experimental/test \
$(LIB_DIR)/include/boost/beast/core \
$(LIB_DIR)/include/boost/beast/http \
$(LIB_DIR)/include/boost/beast/ssl \
$(LIB_DIR)/include/boost/beast/websocket \
$(LIB_DIR)/include/boost/beast/zlib
INPUT_ENCODING = UTF-8
FILE_PATTERNS =
RECURSIVE = NO
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
FILTER_SOURCE_PATTERNS =
USE_MDFILE_AS_MAINPAGE =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to source browsing # Configuration options related to source browsing
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@@ -227,27 +250,6 @@ GENERATE_XML = YES
XML_OUTPUT = $(XML_OUTPUT) XML_OUTPUT = $(XML_OUTPUT)
XML_PROGRAMLISTING = YES XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES
INCLUDE_PATH = ../
INCLUDE_FILE_PATTERNS =
PREDEFINED = \
BOOST_BEAST_DOXYGEN \
BOOST_BEAST_USE_POSIX_FILE=1 \
BOOST_BEAST_USE_WIN32_FILE=1 \
BOOST_BEAST_SPLIT_COMPILATION=1 \
BOOST_ASIO_INITFN_RESULT_TYPE(t,a)=__deduced__ \
GENERATING_DOCUMENTATION \
BOOST_BEAST_DECL
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Configuration options related to external references # Configuration options related to external references
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

2
include/boost/beast.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2013-2017 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2016-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

6
include/boost/beast/_experimental/http/icy_stream.hpp
View File

@@ -227,8 +227,7 @@ public:
template< template<
class MutableBufferSequence, class MutableBufferSequence,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -309,8 +308,7 @@ public:
template< template<
class ConstBufferSequence, class ConstBufferSequence,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);

6
include/boost/beast/_experimental/http/impl/icy_stream.hpp
View File

@@ -473,8 +473,7 @@ template<class NextLayer>
template< template<
class MutableBufferSequence, class MutableBufferSequence,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
icy_stream<NextLayer>:: icy_stream<NextLayer>::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
@@ -526,8 +525,7 @@ template<class NextLayer>
template< template<
class MutableBufferSequence, class MutableBufferSequence,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
icy_stream<NextLayer>:: icy_stream<NextLayer>::
async_write_some( async_write_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,

6
include/boost/beast/_experimental/test/impl/stream.hpp
View File

@@ -304,8 +304,7 @@ read_some(MutableBufferSequence const& buffers,
} }
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
stream:: stream::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
@@ -384,8 +383,7 @@ write_some(
} }
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
stream:: stream::
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,

6
include/boost/beast/_experimental/test/stream.hpp
View File

@@ -431,8 +431,7 @@ public:
operation completes. operation completes.
*/ */
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some(MutableBufferSequence const& buffers, async_read_some(MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -509,8 +508,7 @@ public:
to ensure that all data is written before the asynchronous operation completes. to ensure that all data is written before the asynchronous operation completes.
*/ */
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some(ConstBufferSequence const& buffers, async_write_some(ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);

2
include/boost/beast/core/async_base.hpp
View File

@@ -78,7 +78,7 @@ namespace beast {
// Asynchronously read into a buffer until the buffer is full, or an error occurs // Asynchronously read into a buffer until the buffer is full, or an error occurs
template<class AsyncReadStream, class ReadHandler> template<class AsyncReadStream, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) typename net::async_result<ReadHandler, void(error_code, std::size_t)>::return_type
async_read(AsyncReadStream& stream, net::mutable_buffer buffer, ReadHandler&& handler) async_read(AsyncReadStream& stream, net::mutable_buffer buffer, ReadHandler&& handler)
{ {
using handler_type = BOOST_ASIO_HANDLER_TYPE(ReadHandler, void(error_code, std::size_t)); using handler_type = BOOST_ASIO_HANDLER_TYPE(ReadHandler, void(error_code, std::size_t));

21
include/boost/beast/core/basic_stream.hpp
View File

@@ -905,8 +905,7 @@ public:
@see @ref async_connect @see @ref async_connect
*/ */
template<class ConnectHandler> template<class ConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ConnectHandler, BOOST_BEAST_ASYNC_RESULT1(ConnectHandler)
void(error_code))
async_connect( async_connect(
endpoint_type const& ep, endpoint_type const& ep,
ConnectHandler&& handler); ConnectHandler&& handler);
@@ -963,8 +962,7 @@ public:
EndpointSequence>::value>::type EndpointSequence>::value>::type
#endif #endif
> >
BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
void (error_code, typename Protocol::endpoint))
async_connect( async_connect(
EndpointSequence const& endpoints, EndpointSequence const& endpoints,
RangeConnectHandler&& handler); RangeConnectHandler&& handler);
@@ -1053,8 +1051,7 @@ public:
EndpointSequence>::value>::type EndpointSequence>::value>::type
#endif #endif
> >
BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
void (error_code, typename Protocol::endpoint))
async_connect( async_connect(
EndpointSequence const& endpoints, EndpointSequence const& endpoints,
ConnectCondition connect_condition, ConnectCondition connect_condition,
@@ -1107,8 +1104,7 @@ public:
template< template<
class Iterator, class Iterator,
class IteratorConnectHandler> class IteratorConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
void (error_code, Iterator))
async_connect( async_connect(
Iterator begin, Iterator end, Iterator begin, Iterator end,
IteratorConnectHandler&& handler); IteratorConnectHandler&& handler);
@@ -1165,8 +1161,7 @@ public:
class Iterator, class Iterator,
class ConnectCondition, class ConnectCondition,
class IteratorConnectHandler> class IteratorConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
void (error_code, Iterator))
async_connect( async_connect(
Iterator begin, Iterator end, Iterator begin, Iterator end,
ConnectCondition connect_condition, ConnectCondition connect_condition,
@@ -1286,8 +1281,7 @@ public:
operation completes. operation completes.
*/ */
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
void(error_code, std::size_t))
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -1406,8 +1400,7 @@ public:
operation completes. operation completes.
*/ */
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
void(error_code, std::size_t))
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);

6
include/boost/beast/core/buffered_read_stream.hpp
View File

@@ -264,8 +264,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some(MutableBufferSequence const& buffers, async_read_some(MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -341,8 +340,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some(ConstBufferSequence const& buffers, async_write_some(ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);
}; };

10
include/boost/beast/core/detail/config.hpp
View File

@@ -83,4 +83,14 @@ namespace net = boost::asio;
# define BOOST_BEAST_DECL # define BOOST_BEAST_DECL
#endif #endif
#ifndef BOOST_BEAST_ASYNC_RESULT1
#define BOOST_BEAST_ASYNC_RESULT1(type) \
BOOST_ASIO_INITFN_RESULT_TYPE(type, void(::boost::beast::error_code))
#endif
#ifndef BOOST_BEAST_ASYNC_RESULT2
#define BOOST_BEAST_ASYNC_RESULT2(type) \
BOOST_ASIO_INITFN_RESULT_TYPE(type, void(::boost::beast::error_code, std::size_t))
#endif
#endif #endif

3
include/boost/beast/core/detail/impl/read.hpp
View File

@@ -227,8 +227,7 @@ template<
class CompletionCondition, class CompletionCondition,
class ReadHandler, class ReadHandler,
class> class>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,

3
include/boost/beast/core/detail/read.hpp
View File

@@ -231,8 +231,7 @@ template<
>::type >::type
#endif #endif
> >
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,

2
include/boost/beast/core/file.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/file_base.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/file_posix.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/file_stdio.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/file_win32.hpp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

6
include/boost/beast/core/flat_stream.hpp
View File

@@ -256,8 +256,7 @@ public:
template< template<
class MutableBufferSequence, class MutableBufferSequence,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -338,8 +337,7 @@ public:
template< template<
class ConstBufferSequence, class ConstBufferSequence,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);

21
include/boost/beast/core/impl/basic_stream.hpp
View File

@@ -801,8 +801,7 @@ close()
template<class Protocol, class Executor, class RatePolicy> template<class Protocol, class Executor, class RatePolicy>
template<class ConnectHandler> template<class ConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ConnectHandler, BOOST_BEAST_ASYNC_RESULT1(ConnectHandler)
void(error_code))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_connect( async_connect(
endpoint_type const& ep, endpoint_type const& ep,
@@ -822,8 +821,7 @@ template<
class EndpointSequence, class EndpointSequence,
class RangeConnectHandler, class RangeConnectHandler,
class> class>
BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void(error_code, typename Protocol::endpoint))
void(error_code, typename Protocol::endpoint))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_connect( async_connect(
EndpointSequence const& endpoints, EndpointSequence const& endpoints,
@@ -845,8 +843,7 @@ template<
class ConnectCondition, class ConnectCondition,
class RangeConnectHandler, class RangeConnectHandler,
class> class>
BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
void (error_code, typename Protocol::endpoint))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_connect( async_connect(
EndpointSequence const& endpoints, EndpointSequence const& endpoints,
@@ -867,8 +864,7 @@ template<class Protocol, class Executor, class RatePolicy>
template< template<
class Iterator, class Iterator,
class IteratorConnectHandler> class IteratorConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
void (error_code, Iterator))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_connect( async_connect(
Iterator begin, Iterator end, Iterator begin, Iterator end,
@@ -889,8 +885,7 @@ template<
class Iterator, class Iterator,
class ConnectCondition, class ConnectCondition,
class IteratorConnectHandler> class IteratorConnectHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler, BOOST_ASIO_INITFN_RESULT_TYPE(IteratorConnectHandler,void (error_code, Iterator))
void (error_code, Iterator))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_connect( async_connect(
Iterator begin, Iterator end, Iterator begin, Iterator end,
@@ -911,8 +906,7 @@ async_connect(
template<class Protocol, class Executor, class RatePolicy> template<class Protocol, class Executor, class RatePolicy>
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
void(error_code, std::size_t))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
@@ -932,8 +926,7 @@ async_read_some(
template<class Protocol, class Executor, class RatePolicy> template<class Protocol, class Executor, class RatePolicy>
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
void(error_code, std::size_t))
basic_stream<Protocol, Executor, RatePolicy>:: basic_stream<Protocol, Executor, RatePolicy>::
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,

6
include/boost/beast/core/impl/buffered_read_stream.hpp
View File

@@ -142,8 +142,7 @@ buffered_read_stream(Args&&... args)
template<class Stream, class DynamicBuffer> template<class Stream, class DynamicBuffer>
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
buffered_read_stream<Stream, DynamicBuffer>:: buffered_read_stream<Stream, DynamicBuffer>::
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
@@ -214,8 +213,7 @@ read_some(MutableBufferSequence const& buffers,
template<class Stream, class DynamicBuffer> template<class Stream, class DynamicBuffer>
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
buffered_read_stream<Stream, DynamicBuffer>:: buffered_read_stream<Stream, DynamicBuffer>::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,

2
include/boost/beast/core/impl/file_posix.ipp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/impl/file_stdio.ipp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

2
include/boost/beast/core/impl/file_win32.ipp
View File

@@ -1,5 +1,5 @@
// //
// Copyright (c) 2015-2016 Vinnie Falco (vinnie dot falco at gmail dot com) // Copyright (c) 2015-2019 Vinnie Falco (vinnie dot falco at gmail dot com)
// //
// Distributed under the Boost Software License, Version 1.0. (See accompanying // Distributed under the Boost Software License, Version 1.0. (See accompanying
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

6
include/boost/beast/core/impl/flat_stream.hpp
View File

@@ -147,8 +147,7 @@ template<class NextLayer>
template< template<
class MutableBufferSequence, class MutableBufferSequence,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
flat_stream<NextLayer>:: flat_stream<NextLayer>::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
@@ -229,8 +228,7 @@ template<class NextLayer>
template< template<
class ConstBufferSequence, class ConstBufferSequence,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
flat_stream<NextLayer>:: flat_stream<NextLayer>::
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,

3
include/boost/beast/http/impl/file_body_win32.hpp
View File

@@ -544,8 +544,7 @@ template<
class Protocol, class Executor, class Protocol, class Executor,
bool isRequest, class Fields, bool isRequest, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some( async_write_some(
net::basic_stream_socket< net::basic_stream_socket<
Protocol, Executor>& sock, Protocol, Executor>& sock,

12
include/boost/beast/http/impl/read.hpp
View File

@@ -301,8 +301,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -371,8 +370,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_header( async_read_header(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -442,8 +440,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -531,8 +528,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, class Body, class Allocator, bool isRequest, class Body, class Allocator,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,

18
include/boost/beast/http/impl/write.hpp
View File

@@ -463,8 +463,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some_impl( async_write_some_impl(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -527,8 +526,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some( async_write_some(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -610,8 +608,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_header( async_write_header(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -684,8 +681,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -807,8 +803,7 @@ template<
class WriteHandler> class WriteHandler>
typename std::enable_if< typename std::enable_if<
is_mutable_body_writer<Body>::value, is_mutable_body_writer<Body>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)>::type
WriteHandler, void(error_code, std::size_t))>::type
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,
message<isRequest, Body, Fields>& msg, message<isRequest, Body, Fields>& msg,
@@ -837,8 +832,7 @@ template<
class WriteHandler> class WriteHandler>
typename std::enable_if< typename std::enable_if<
! is_mutable_body_writer<Body>::value, ! is_mutable_body_writer<Body>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)>::type
WriteHandler, void(error_code, std::size_t))>::type
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,
message<isRequest, Body, Fields> const& msg, message<isRequest, Body, Fields> const& msg,

12
include/boost/beast/http/read.hpp
View File

@@ -207,8 +207,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -403,8 +402,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_header( async_read_header(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -599,8 +597,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, bool isRequest,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -804,8 +801,7 @@ template<
class DynamicBuffer, class DynamicBuffer,
bool isRequest, class Body, class Allocator, bool isRequest, class Body, class Allocator,
class ReadHandler> class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
AsyncReadStream& stream, AsyncReadStream& stream,
DynamicBuffer& buffer, DynamicBuffer& buffer,

21
include/boost/beast/http/write.hpp
View File

@@ -172,8 +172,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some( async_write_some(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -301,8 +300,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_header( async_write_header(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -421,8 +419,7 @@ template<
class AsyncWriteStream, class AsyncWriteStream,
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,
serializer<isRequest, Body, Fields>& sr, serializer<isRequest, Body, Fields>& sr,
@@ -646,13 +643,11 @@ template<
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
#if BOOST_BEAST_DOXYGEN #if BOOST_BEAST_DOXYGEN
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
#else #else
typename std::enable_if< typename std::enable_if<
is_mutable_body_writer<Body>::value, is_mutable_body_writer<Body>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)>::type
WriteHandler, void(error_code, std::size_t))>::type
#endif #endif
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,
@@ -709,13 +704,11 @@ template<
bool isRequest, class Body, class Fields, bool isRequest, class Body, class Fields,
class WriteHandler> class WriteHandler>
#if BOOST_BEAST_DOXYGEN #if BOOST_BEAST_DOXYGEN
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
#else #else
typename std::enable_if< typename std::enable_if<
! is_mutable_body_writer<Body>::value, ! is_mutable_body_writer<Body>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)>::type
WriteHandler, void(error_code, std::size_t))>::type
#endif #endif
async_write( async_write(
AsyncWriteStream& stream, AsyncWriteStream& stream,

2
include/boost/beast/version.hpp
View File

@@ -13,7 +13,7 @@
#include <boost/beast/core/detail/config.hpp> #include <boost/beast/core/detail/config.hpp>
#include <boost/config.hpp> #include <boost/config.hpp>
/** @def BOOST_BEAST_API_VERSION /* BOOST_BEAST_VERSION
Identifies the API version of Beast. Identifies the API version of Beast.

18
include/boost/beast/websocket/impl/accept.hpp
View File

@@ -545,8 +545,7 @@ accept(
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template< template<
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept( async_accept(
AcceptHandler&& handler) AcceptHandler&& handler)
@@ -568,8 +567,7 @@ template<class NextLayer, bool deflateSupported>
template< template<
class ResponseDecorator, class ResponseDecorator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept_ex( async_accept_ex(
ResponseDecorator const& decorator, ResponseDecorator const& decorator,
@@ -597,8 +595,7 @@ template<
class AcceptHandler> class AcceptHandler>
typename std::enable_if< typename std::enable_if<
! http::detail::is_header<ConstBufferSequence>::value, ! http::detail::is_header<ConstBufferSequence>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)>::type
AcceptHandler, void(error_code))>::type
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept( async_accept(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
@@ -627,8 +624,7 @@ template<
class AcceptHandler> class AcceptHandler>
typename std::enable_if< typename std::enable_if<
! http::detail::is_header<ConstBufferSequence>::value, ! http::detail::is_header<ConstBufferSequence>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)>::type
AcceptHandler, void(error_code))>::type
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept_ex( async_accept_ex(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
@@ -658,8 +654,7 @@ template<class NextLayer, bool deflateSupported>
template< template<
class Body, class Allocator, class Body, class Allocator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept( async_accept(
http::request<Body, http::basic_fields<Allocator>> const& req, http::request<Body, http::basic_fields<Allocator>> const& req,
@@ -683,8 +678,7 @@ template<
class Body, class Allocator, class Body, class Allocator,
class ResponseDecorator, class ResponseDecorator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_accept_ex( async_accept_ex(
http::request<Body, http::basic_fields<Allocator>> const& req, http::request<Body, http::basic_fields<Allocator>> const& req,

3
include/boost/beast/websocket/impl/close.hpp
View File

@@ -381,8 +381,7 @@ close(close_reason const& cr, error_code& ec)
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class CloseHandler> template<class CloseHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(CloseHandler)
CloseHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_close(close_reason const& cr, CloseHandler&& handler) async_close(close_reason const& cr, CloseHandler&& handler)
{ {

12
include/boost/beast/websocket/impl/handshake.hpp
View File

@@ -267,8 +267,7 @@ do_handshake(
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class HandshakeHandler> template<class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_handshake( async_handshake(
string_view host, string_view host,
@@ -293,8 +292,7 @@ async_handshake(
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class HandshakeHandler> template<class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_handshake( async_handshake(
response_type& res, response_type& res,
@@ -470,8 +468,7 @@ handshake_ex(response_type& res,
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class RequestDecorator, class HandshakeHandler> template<class RequestDecorator, class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_handshake_ex(string_view host, async_handshake_ex(string_view host,
string_view target, string_view target,
@@ -503,8 +500,7 @@ async_handshake_ex(string_view host,
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class RequestDecorator, class HandshakeHandler> template<class RequestDecorator, class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_handshake_ex(response_type& res, async_handshake_ex(response_type& res,
string_view host, string_view host,

6
include/boost/beast/websocket/impl/ping.hpp
View File

@@ -286,8 +286,7 @@ pong(ping_data const& payload, error_code& ec)
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class WriteHandler> template<class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
WriteHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_ping(ping_data const& payload, WriteHandler&& handler) async_ping(ping_data const& payload, WriteHandler&& handler)
{ {
@@ -305,8 +304,7 @@ async_ping(ping_data const& payload, WriteHandler&& handler)
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class WriteHandler> template<class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
WriteHandler, void(error_code))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_pong(ping_data const& payload, WriteHandler&& handler) async_pong(ping_data const& payload, WriteHandler&& handler)
{ {

9
include/boost/beast/websocket/impl/read.hpp
View File

@@ -795,8 +795,7 @@ read(DynamicBuffer& buffer, error_code& ec)
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class DynamicBuffer, class ReadHandler> template<class DynamicBuffer, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_read(DynamicBuffer& buffer, ReadHandler&& handler) async_read(DynamicBuffer& buffer, ReadHandler&& handler)
{ {
@@ -870,8 +869,7 @@ read_some(
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class DynamicBuffer, class ReadHandler> template<class DynamicBuffer, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_read_some( async_read_some(
DynamicBuffer& buffer, DynamicBuffer& buffer,
@@ -1254,8 +1252,7 @@ loop:
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,

6
include/boost/beast/websocket/impl/write.hpp
View File

@@ -698,8 +698,7 @@ write_some(bool fin,
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_write_some(bool fin, async_write_some(bool fin,
ConstBufferSequence const& bs, WriteHandler&& handler) ConstBufferSequence const& bs, WriteHandler&& handler)
@@ -755,8 +754,7 @@ write(ConstBufferSequence const& buffers, error_code& ec)
template<class NextLayer, bool deflateSupported> template<class NextLayer, bool deflateSupported>
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
stream<NextLayer, deflateSupported>:: stream<NextLayer, deflateSupported>::
async_write( async_write(
ConstBufferSequence const& bs, WriteHandler&& handler) ConstBufferSequence const& bs, WriteHandler&& handler)

54
include/boost/beast/websocket/stream.hpp
View File

@@ -877,8 +877,7 @@ public:
@li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a> @li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a>
*/ */
template<class HandshakeHandler> template<class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
async_handshake( async_handshake(
string_view host, string_view host,
string_view target, string_view target,
@@ -961,8 +960,7 @@ public:
@li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a> @li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a>
*/ */
template<class HandshakeHandler> template<class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
async_handshake( async_handshake(
response_type& res, response_type& res,
string_view host, string_view host,
@@ -1283,8 +1281,7 @@ public:
@li <a href="https://tools.ietf.org/html/rfc6455#section-4.2">Websocket Opening Handshake Server Requirements (RFC6455)</a> @li <a href="https://tools.ietf.org/html/rfc6455#section-4.2">Websocket Opening Handshake Server Requirements (RFC6455)</a>
*/ */
template<class AcceptHandler> template<class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
async_accept(AcceptHandler&& handler); async_accept(AcceptHandler&& handler);
/** Perform the WebSocket handshake asynchronously in the server role. /** Perform the WebSocket handshake asynchronously in the server role.
@@ -1354,8 +1351,7 @@ public:
#else #else
typename std::enable_if< typename std::enable_if<
! http::detail::is_header<ConstBufferSequence>::value, ! http::detail::is_header<ConstBufferSequence>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)>::type
AcceptHandler, void(error_code))>::type
#endif #endif
async_accept( async_accept(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
@@ -1413,8 +1409,7 @@ public:
template< template<
class Body, class Allocator, class Body, class Allocator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
async_accept( async_accept(
http::request<Body, http::request<Body,
http::basic_fields<Allocator>> const& req, http::basic_fields<Allocator>> const& req,
@@ -1546,8 +1541,7 @@ public:
@li <a href="https://tools.ietf.org/html/rfc6455#section-7.1.2">Websocket Closing Handshake (RFC6455)</a> @li <a href="https://tools.ietf.org/html/rfc6455#section-7.1.2">Websocket Closing Handshake (RFC6455)</a>
*/ */
template<class CloseHandler> template<class CloseHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(CloseHandler)
CloseHandler, void(error_code))
async_close(close_reason const& cr, CloseHandler&& handler); async_close(close_reason const& cr, CloseHandler&& handler);
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@@ -1644,8 +1638,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class WriteHandler> template<class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
WriteHandler, void(error_code))
async_ping(ping_data const& payload, WriteHandler&& handler); async_ping(ping_data const& payload, WriteHandler&& handler);
/** Send a websocket pong control frame. /** Send a websocket pong control frame.
@@ -1748,8 +1741,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class WriteHandler> template<class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
WriteHandler, void(error_code))
async_pong(ping_data const& payload, WriteHandler&& handler); async_pong(ping_data const& payload, WriteHandler&& handler);
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@@ -1905,8 +1897,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class DynamicBuffer, class ReadHandler> template<class DynamicBuffer, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read( async_read(
DynamicBuffer& buffer, DynamicBuffer& buffer,
ReadHandler&& handler); ReadHandler&& handler);
@@ -2081,8 +2072,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class DynamicBuffer, class ReadHandler> template<class DynamicBuffer, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
DynamicBuffer& buffer, DynamicBuffer& buffer,
std::size_t limit, std::size_t limit,
@@ -2253,8 +2243,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class MutableBufferSequence, class ReadHandler> template<class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
ReadHandler, void(error_code, std::size_t))
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
ReadHandler&& handler); ReadHandler&& handler);
@@ -2375,8 +2364,7 @@ public:
template< template<
class ConstBufferSequence, class ConstBufferSequence,
class WriteHandler> class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write( async_write(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
WriteHandler&& handler); WriteHandler&& handler);
@@ -2495,8 +2483,7 @@ public:
manner equivalent to using `net::post`. manner equivalent to using `net::post`.
*/ */
template<class ConstBufferSequence, class WriteHandler> template<class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
WriteHandler, void(error_code, std::size_t))
async_write_some(bool fin, async_write_some(bool fin,
ConstBufferSequence const& buffers, WriteHandler&& handler); ConstBufferSequence const& buffers, WriteHandler&& handler);
@@ -2538,8 +2525,7 @@ public:
error_code& ec); error_code& ec);
template<class RequestDecorator, class HandshakeHandler> template<class RequestDecorator, class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
async_handshake_ex( async_handshake_ex(
string_view host, string_view host,
string_view target, string_view target,
@@ -2547,8 +2533,7 @@ public:
HandshakeHandler&& handler); HandshakeHandler&& handler);
template<class RequestDecorator, class HandshakeHandler> template<class RequestDecorator, class HandshakeHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
HandshakeHandler, void(error_code))
async_handshake_ex( async_handshake_ex(
response_type& res, response_type& res,
string_view host, string_view host,
@@ -2600,8 +2585,7 @@ public:
template< template<
class ResponseDecorator, class ResponseDecorator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
async_accept_ex( async_accept_ex(
ResponseDecorator const& decorator, ResponseDecorator const& decorator,
AcceptHandler&& handler); AcceptHandler&& handler);
@@ -2612,8 +2596,7 @@ public:
class AcceptHandler> class AcceptHandler>
typename std::enable_if< typename std::enable_if<
! http::detail::is_header<ConstBufferSequence>::value, ! http::detail::is_header<ConstBufferSequence>::value,
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)>::type
AcceptHandler, void(error_code))>::type
async_accept_ex( async_accept_ex(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
ResponseDecorator const& decorator, ResponseDecorator const& decorator,
@@ -2623,8 +2606,7 @@ public:
class Body, class Allocator, class Body, class Allocator,
class ResponseDecorator, class ResponseDecorator,
class AcceptHandler> class AcceptHandler>
BOOST_ASIO_INITFN_RESULT_TYPE( BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
AcceptHandler, void(error_code))
async_accept_ex( async_accept_ex(
http::request<Body, http::request<Body,
http::basic_fields<Allocator>> const& req, http::basic_fields<Allocator>> const& req,

2
test/beast/core/async_base.cpp
View File

@@ -581,7 +581,7 @@ public:
// Asynchronously read into a buffer until the buffer is full, or an error occurs // Asynchronously read into a buffer until the buffer is full, or an error occurs
template<class AsyncReadStream, class ReadHandler> template<class AsyncReadStream, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) typename net::async_result<ReadHandler, void(error_code, std::size_t)>::return_type
async_read(AsyncReadStream& stream, net::mutable_buffer buffer, ReadHandler&& handler) async_read(AsyncReadStream& stream, net::mutable_buffer buffer, ReadHandler&& handler)
{ {
using handler_type = BOOST_ASIO_HANDLER_TYPE(ReadHandler, void(error_code, std::size_t)); using handler_type = BOOST_ASIO_HANDLER_TYPE(ReadHandler, void(error_code, std::size_t));

6
test/doc/core_4_layers.cpp
View File

@@ -244,8 +244,7 @@ public:
/// Read some data from the stream asynchronously /// Read some data from the stream asynchronously
template <class MutableBufferSequence, class ReadHandler> template <class MutableBufferSequence, class ReadHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
void(error_code, std::size_t))
async_read_some( async_read_some(
MutableBufferSequence const& buffers, MutableBufferSequence const& buffers,
ReadHandler&& handler) ReadHandler&& handler)
@@ -261,8 +260,7 @@ public:
/// Write some data to the stream asynchronously /// Write some data to the stream asynchronously
template <class ConstBufferSequence, class WriteHandler> template <class ConstBufferSequence, class WriteHandler>
BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
void(error_code, std::size_t))
async_write_some( async_write_some(
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
WriteHandler&& handler) WriteHandler&& handler)