diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp b/3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp index d5178d04734..b17fe404b89 100644 --- a/3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp +++ b/3rdparty/asio/include/asio/detail/win_iocp_wait_op.hpp @@ -2,7 +2,7 @@ // detail/win_iocp_wait_op.hpp // ~~~~~~~~~~~~~~~~~~~~~~~~~~~ // -// Copyright (c) 2003-2016 Christopher M. Kohlhoff (chris at kohlhoff dot com) +// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com) // // 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) @@ -24,6 +24,7 @@ #include "asio/detail/fenced_block.hpp" #include "asio/detail/handler_alloc_helpers.hpp" #include "asio/detail/handler_invoke_helpers.hpp" +#include "asio/detail/handler_work.hpp" #include "asio/detail/memory.hpp" #include "asio/detail/reactor_op.hpp" #include "asio/detail/socket_ops.hpp" @@ -34,20 +35,21 @@ namespace asio { namespace detail { -template <typename Handler> +template <typename Handler, typename IoExecutor> class win_iocp_wait_op : public reactor_op { public: ASIO_DEFINE_HANDLER_PTR(win_iocp_wait_op); win_iocp_wait_op(socket_ops::weak_cancel_token_type cancel_token, - Handler& handler) - : reactor_op(&win_iocp_wait_op::do_perform, + Handler& handler, const IoExecutor& io_ex) + : reactor_op(asio::error_code(), + &win_iocp_wait_op::do_perform, &win_iocp_wait_op::do_complete), cancel_token_(cancel_token), - handler_(ASIO_MOVE_CAST(Handler)(handler)) + handler_(ASIO_MOVE_CAST(Handler)(handler)), + work_(handler_, io_ex) { - handler_work<Handler>::start(handler_); } static status do_perform(reactor_op*) @@ -64,10 +66,14 @@ public: // Take ownership of the operation object. win_iocp_wait_op* o(static_cast<win_iocp_wait_op*>(base)); ptr p = { asio::detail::addressof(o->handler_), o, o }; - handler_work<Handler> w(o->handler_); ASIO_HANDLER_COMPLETION((*o)); + // Take ownership of the operation's outstanding work. + handler_work<Handler, IoExecutor> w( + ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)( + o->work_)); + // The reactor may have stored a result in the operation object. if (o->ec_) ec = o->ec_; @@ -109,6 +115,7 @@ public: private: socket_ops::weak_cancel_token_type cancel_token_; Handler handler_; + handler_work<Handler, IoExecutor> work_; }; } // namespace detail |