diff options
Diffstat (limited to '3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp')
-rw-r--r-- | 3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp b/3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp index 94b4048250d..b0e0fbf2975 100644 --- a/3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp +++ b/3rdparty/asio/include/asio/detail/winrt_socket_connect_op.hpp @@ -2,7 +2,7 @@ // detail/winrt_socket_connect_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/winrt_async_op.hpp" #include "asio/error.hpp" @@ -33,18 +34,18 @@ namespace asio { namespace detail { -template <typename Handler> +template <typename Handler, typename IoExecutor> class winrt_socket_connect_op : public winrt_async_op<void> { public: ASIO_DEFINE_HANDLER_PTR(winrt_socket_connect_op); - winrt_socket_connect_op(Handler& handler) + winrt_socket_connect_op(Handler& handler, const IoExecutor& io_ex) : winrt_async_op<void>(&winrt_socket_connect_op::do_complete), - handler_(ASIO_MOVE_CAST(Handler)(handler)) + handler_(ASIO_MOVE_CAST(Handler)(handler)), + work_(handler_, io_ex) { - handler_work<Handler>::start(handler_); } static void do_complete(void* owner, operation* base, @@ -53,10 +54,14 @@ public: // Take ownership of the operation object. winrt_socket_connect_op* o(static_cast<winrt_socket_connect_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_)); + // Make a copy of the handler so that the memory can be deallocated before // the upcall is made. Even if we're not about to make an upcall, a // sub-object of the handler may be the true owner of the memory associated @@ -80,6 +85,7 @@ public: private: Handler handler_; + handler_work<Handler, IoExecutor> executor_; }; } // namespace detail |