From 22b4e17fadf0d2f93b55ce12fdbda24ef90c11d8 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Fri, 16 Aug 2013 06:07:36 -0700 Subject: [PATCH] Allow selective enabling of async future returns --- modules/beast_asio/sockets/beast_Socket.h | 10 +++++----- modules/beast_asio/sockets/beast_SocketWrapper.h | 6 +++--- .../beast_asio/streams/beast_prefilled_read_stream.h | 4 ++-- modules/beast_asio/system/beast_BoostIncludes.h | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/modules/beast_asio/sockets/beast_Socket.h b/modules/beast_asio/sockets/beast_Socket.h index d1e2559d38..a9bf4c285a 100644 --- a/modules/beast_asio/sockets/beast_Socket.h +++ b/modules/beast_asio/sockets/beast_Socket.h @@ -165,7 +165,7 @@ public: virtual error_code accept (Socket& peer, error_code& ec); template - BOOST_ASIO_INITFN_RESULT_TYPE(AcceptHandler, void (error_code)) + BEAST_ASIO_INITFN_RESULT_TYPE(AcceptHandler, void (error_code)) async_accept (Socket& peer, BOOST_ASIO_MOVE_ARG(AcceptHandler) handler) { return async_accept (peer, @@ -206,7 +206,7 @@ public: // AsyncReadStream // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/AsyncReadStream.html template - BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) async_read_some (MutableBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(ReadHandler) handler) { return async_read_some (MutableBuffers (buffers), @@ -221,7 +221,7 @@ public: // AsyncWriteStream // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/AsyncWriteStream.html template - BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (error_code, std::size_t)) async_write_some (ConstBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(WriteHandler) handler) { return async_write_some (ConstBuffers (buffers), @@ -271,7 +271,7 @@ public: // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/async_handshake/overload1.html // template - BOOST_ASIO_INITFN_RESULT_TYPE(HandshakeHandler, void (error_code)) + BEAST_ASIO_INITFN_RESULT_TYPE(HandshakeHandler, void (error_code)) async_handshake (handshake_type type, BOOST_ASIO_MOVE_ARG(HandshakeHandler) handler) { return async_handshake (type, @@ -313,7 +313,7 @@ public: // http://www.boost.org/doc/libs/1_54_0/doc/html/boost_asio/reference/ssl__stream/async_handshake/overload2.html // template - BOOST_ASIO_INITFN_RESULT_TYPE(BufferedHandshakeHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(BufferedHandshakeHandler, void (error_code, std::size_t)) async_handshake (handshake_type type, ConstBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(BufferedHandshakeHandler) handler) { diff --git a/modules/beast_asio/sockets/beast_SocketWrapper.h b/modules/beast_asio/sockets/beast_SocketWrapper.h index 77c0ff7b5f..77c8aeaebf 100644 --- a/modules/beast_asio/sockets/beast_SocketWrapper.h +++ b/modules/beast_asio/sockets/beast_SocketWrapper.h @@ -375,7 +375,7 @@ public: } template - BOOST_ASIO_INITFN_RESULT_TYPE(ErrorCall, void (error_code)) + BEAST_ASIO_INITFN_RESULT_TYPE(ErrorCall, void (error_code)) async_accept (Socket& peer, BOOST_ASIO_MOVE_ARG(AcceptHandler) handler, boost::true_type) { @@ -386,7 +386,7 @@ public: } template - BOOST_ASIO_INITFN_RESULT_TYPE(AcceptHandler, void (error_code)) + BEAST_ASIO_INITFN_RESULT_TYPE(AcceptHandler, void (error_code)) async_accept (Socket&, BOOST_ASIO_MOVE_ARG(AcceptHandler) handler, boost::false_type) { @@ -485,7 +485,7 @@ public: } template - BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) async_read_some (MutableBufferSequence const&, BOOST_ASIO_MOVE_ARG(ReadHandler) handler, boost::false_type) { diff --git a/modules/beast_asio/streams/beast_prefilled_read_stream.h b/modules/beast_asio/streams/beast_prefilled_read_stream.h index a9ca192b35..e42b1e7bc2 100644 --- a/modules/beast_asio/streams/beast_prefilled_read_stream.h +++ b/modules/beast_asio/streams/beast_prefilled_read_stream.h @@ -143,7 +143,7 @@ public: } template - BOOST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(ReadHandler, void (error_code, std::size_t)) async_read_some (MutableBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(ReadHandler) handler) { @@ -178,7 +178,7 @@ public: } template - BOOST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (error_code, std::size_t)) + BEAST_ASIO_INITFN_RESULT_TYPE(WriteHandler, void (error_code, std::size_t)) async_write_some (ConstBufferSequence const& buffers, BOOST_ASIO_MOVE_ARG(WriteHandler) handler) { diff --git a/modules/beast_asio/system/beast_BoostIncludes.h b/modules/beast_asio/system/beast_BoostIncludes.h index a3a48406f4..07481c2a90 100644 --- a/modules/beast_asio/system/beast_BoostIncludes.h +++ b/modules/beast_asio/system/beast_BoostIncludes.h @@ -66,9 +66,10 @@ #endif #if ! BEAST_ASIO_HAS_FUTURE_RETURNS -# define BOOST_ASIO_INITFN_RESULT_TYPE(expr,val) void +# define BEAST_ASIO_INITFN_RESULT_TYPE(expr,val) void # define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(expr,val) void #else +# define BEAST_ASIO_INITFN_RESULT_TYPE(expr,val) BOOST_ASIO_INITFN_RESULT_TYPE(expr,val) # if defined(GENERATING_DOCUMENTATION) # define BEAST_ASIO_INITFN_RESULT_TYPE_MEMBER(h, sig) \ void_or_deduced