Support Concepts for completion token params

CHANGELOG.md

@@ -3,6 +3,7 @@ Version 275:
 * Async init-fns use the executor's default token
 * Add basic_stream::rebind_executor
 * Use automatically deduced return types for all async operations
+* Support Concepts for completion token params
 
 --------------------------------------------------------------------------------
 

doc/source.dox

@@ -49,9 +49,13 @@ PREDEFINED             = \
                         BOOST_BEAST_SPLIT_COMPILATION=1 \
                         "BOOST_BEAST_ASYNC_RESULT1(t)=__deduced__" \
                         "BOOST_BEAST_ASYNC_RESULT2(t)=__deduced__" \
+                        "BOOST_BEAST_ASYNC_TPARAM1=class" \
+                        "BOOST_BEAST_ASYNC_TPARAM2=class" \
                         "BOOST_ASIO_INITFN_RESULT_TYPE(t,a)=__deduced__" \
+                        "BOOST_ASIO_COMPLETION_TOKEN_FOR(sig)=class" \
                         GENERATING_DOCUMENTATION \
                         BOOST_BEAST_DECL
+
 EXPAND_AS_DEFINED      =
 SKIP_FUNCTION_MACROS   = YES
 

include/boost/beast/_experimental/http/icy_stream.hpp

@@ -224,7 +224,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -306,7 +306,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)

include/boost/beast/_experimental/test/stream.hpp

@@ -477,7 +477,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler>
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
     async_read_some(
         MutableBufferSequence const& buffers,
@@ -555,7 +555,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler>
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler>
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
     async_write_some(
         ConstBufferSequence const& buffers,

include/boost/beast/core/basic_stream.hpp

@@ -921,7 +921,7 @@ public:
         @see async_connect
     */
     template<
-        class ConnectHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 ConnectHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(ConnectHandler)
@@ -974,7 +974,9 @@ public:
     */
     template<
         class EndpointSequence,
-        class RangeConnectHandler =
+        BOOST_ASIO_COMPLETION_TOKEN_FOR(
+            void(error_code, typename Protocol::endpoint))
+            RangeConnectHandler =
                 net::default_completion_token_t<executor_type>
     #if ! BOOST_BEAST_DOXYGEN
         ,class = typename std::enable_if<
@@ -982,7 +984,9 @@ public:
                 EndpointSequence>::value>::type
     #endif
     >
-    BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
+    BOOST_ASIO_INITFN_RESULT_TYPE(
+        RangeConnectHandler,
+        void(error_code, typename Protocol::endpoint))
     async_connect(
         EndpointSequence const& endpoints,
         RangeConnectHandler&& handler =
@@ -1063,7 +1067,9 @@ public:
     template<
         class EndpointSequence,
         class ConnectCondition,
-        class RangeConnectHandler =
+        BOOST_ASIO_COMPLETION_TOKEN_FOR(
+            void(error_code, typename Protocol::endpoint))
+            RangeConnectHandler =
                 net::default_completion_token_t<executor_type>
     #if ! BOOST_BEAST_DOXYGEN
         ,class = typename std::enable_if<
@@ -1071,7 +1077,9 @@ public:
                 EndpointSequence>::value>::type
     #endif
     >
-    BOOST_ASIO_INITFN_RESULT_TYPE(RangeConnectHandler,void (error_code, typename Protocol::endpoint))
+    BOOST_ASIO_INITFN_RESULT_TYPE(
+        RangeConnectHandler,
+        void(error_code, typename Protocol::endpoint))
     async_connect(
         EndpointSequence const& endpoints,
         ConnectCondition connect_condition,
@@ -1123,7 +1131,9 @@ public:
     */
     template<
         class Iterator,
-        class IteratorConnectHandler =
+        BOOST_ASIO_COMPLETION_TOKEN_FOR(
+            void(error_code, Iterator))
+            IteratorConnectHandler =
                 net::default_completion_token_t<executor_type>>
     BOOST_ASIO_INITFN_RESULT_TYPE(
         IteratorConnectHandler,
@@ -1182,7 +1192,9 @@ public:
     template<
         class Iterator,
         class ConnectCondition,
-        class IteratorConnectHandler =
+        BOOST_ASIO_COMPLETION_TOKEN_FOR(
+            void(error_code, Iterator))
+            IteratorConnectHandler =
                 net::default_completion_token_t<executor_type>>
     BOOST_ASIO_INITFN_RESULT_TYPE(
         IteratorConnectHandler,
@@ -1306,7 +1318,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -1429,7 +1441,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<Executor>
     >
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)

include/boost/beast/core/buffered_read_stream.hpp

@@ -263,7 +263,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
     async_read_some(
@@ -342,7 +342,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
     async_write_some(

include/boost/beast/core/detail/config.hpp

@@ -90,7 +90,15 @@ namespace net = boost::asio;
 
 #ifndef BOOST_BEAST_ASYNC_RESULT2
 #define BOOST_BEAST_ASYNC_RESULT2(type) \
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(type, void(::boost::beast::error_code, std::size_t))
+    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(type, void(::boost::beast::error_code, ::std::size_t))
+#endif
+
+#ifndef BOOST_BEAST_ASYNC_TPARAM1
+#define BOOST_BEAST_ASYNC_TPARAM1 BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::beast::error_code))
+#endif
+
+#ifndef BOOST_BEAST_ASYNC_TPARAM2
+#define BOOST_BEAST_ASYNC_TPARAM2 BOOST_ASIO_COMPLETION_TOKEN_FOR(void(::boost::beast::error_code, ::std::size_t))
 #endif
 
 #endif

include/boost/beast/core/flat_stream.hpp

@@ -253,7 +253,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
     async_read_some(
@@ -334,7 +334,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
     async_write_some(

include/boost/beast/http/read.hpp

@@ -205,7 +205,7 @@ template<
     class AsyncReadStream,
     class DynamicBuffer,
     bool isRequest,
-    class ReadHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
         net::default_completion_token_t<
             executor_type<AsyncReadStream>>>
 BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -402,7 +402,7 @@ template<
     class AsyncReadStream,
     class DynamicBuffer,
     bool isRequest,
-    class ReadHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
         net::default_completion_token_t<
             executor_type<AsyncReadStream>>>
 BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -599,7 +599,7 @@ template<
     class AsyncReadStream,
     class DynamicBuffer,
     bool isRequest,
-    class ReadHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
         net::default_completion_token_t<
             executor_type<AsyncReadStream>>>
 BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -805,7 +805,7 @@ template<
     class AsyncReadStream,
     class DynamicBuffer,
     bool isRequest, class Body, class Allocator,
-    class ReadHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
         net::default_completion_token_t<
             executor_type<AsyncReadStream>>>
 BOOST_BEAST_ASYNC_RESULT2(ReadHandler)

include/boost/beast/http/write.hpp

@@ -166,7 +166,7 @@ write_some(
 template<
     class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
-    class WriteHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
         net::default_completion_token_t<
             executor_type<AsyncWriteStream>>>
 BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
@@ -296,7 +296,7 @@ write_header(
 template<
     class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
-    class WriteHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
         net::default_completion_token_t<
             executor_type<AsyncWriteStream>>>
 BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
@@ -417,7 +417,7 @@ write(
 template<
     class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
-    class WriteHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
         net::default_completion_token_t<
             executor_type<AsyncWriteStream>>>
 BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
@@ -642,7 +642,7 @@ write(
 template<
     class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
-    class WriteHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
         net::default_completion_token_t<
             executor_type<AsyncWriteStream>>>
 BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
@@ -704,7 +704,7 @@ async_write(
 template<
     class AsyncWriteStream,
     bool isRequest, class Body, class Fields,
-    class WriteHandler =
+    BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
         net::default_completion_token_t<
             executor_type<AsyncWriteStream>>>
 BOOST_BEAST_ASYNC_RESULT2(WriteHandler)

include/boost/beast/websocket/stream.hpp

@@ -876,7 +876,7 @@ public:
         @li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a>
     */
     template<
-        class HandshakeHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
@@ -962,7 +962,7 @@ public:
         @li <a href="https://tools.ietf.org/html/rfc7230#section-5.3.1">origin-form (RFC7230)</a>
     */
     template<
-        class HandshakeHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 HandshakeHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(HandshakeHandler)
@@ -1286,7 +1286,7 @@ public:
         @li <a href="https://tools.ietf.org/html/rfc6455#section-4.2">Websocket Opening Handshake Server Requirements (RFC6455)</a>
     */
     template<
-        class AcceptHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
@@ -1354,7 +1354,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class AcceptHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
@@ -1419,7 +1419,7 @@ public:
     */
     template<
         class Body, class Allocator,
-        class AcceptHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 AcceptHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(AcceptHandler)
@@ -1554,7 +1554,7 @@ public:
         @li <a href="https://tools.ietf.org/html/rfc6455#section-7.1.2">Websocket Closing Handshake (RFC6455)</a>
     */
     template<
-        class CloseHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 CloseHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(CloseHandler)
@@ -1656,7 +1656,7 @@ public:
         manner equivalent to using `net::post`.
     */
     template<
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 WriteHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
@@ -1764,7 +1764,7 @@ public:
         manner equivalent to using `net::post`.
     */
     template<
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM1 WriteHandler =
             net::default_completion_token_t<executor_type>
     >
     BOOST_BEAST_ASYNC_RESULT1(WriteHandler)
@@ -1926,7 +1926,7 @@ public:
     */
     template<
         class DynamicBuffer,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<
                 executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -2105,7 +2105,7 @@ public:
     */
     template<
         class DynamicBuffer,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<
                 executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -2280,7 +2280,7 @@ public:
     */
     template<
         class MutableBufferSequence,
-        class ReadHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 ReadHandler =
             net::default_completion_token_t<
                 executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(ReadHandler)
@@ -2403,7 +2403,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<
                 executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)
@@ -2526,7 +2526,7 @@ public:
     */
     template<
         class ConstBufferSequence,
-        class WriteHandler =
+        BOOST_BEAST_ASYNC_TPARAM2 WriteHandler =
             net::default_completion_token_t<
                 executor_type>>
     BOOST_BEAST_ASYNC_RESULT2(WriteHandler)