#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
#include <boost/asio/detail/config.hpp>
-#include <boost/asio/error.hpp>
-#include <boost/asio/ip/basic_resolver_results.hpp>
#include <boost/asio/detail/bind_handler.hpp>
#include <boost/asio/detail/fenced_block.hpp>
#include <boost/asio/detail/handler_alloc_helpers.hpp>
#include <boost/asio/detail/handler_invoke_helpers.hpp>
+#include <boost/asio/detail/handler_work.hpp>
#include <boost/asio/detail/memory.hpp>
#include <boost/asio/detail/resolve_op.hpp>
#include <boost/asio/detail/socket_ops.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/ip/basic_resolver_results.hpp>
#if defined(BOOST_ASIO_HAS_IOCP)
# include <boost/asio/detail/win_iocp_io_context.hpp>
endpoint_(endpoint),
scheduler_(sched),
handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
- io_executor_(io_ex)
+ work_(handler_, io_ex)
{
- handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
}
static void do_complete(void* owner, operation* base,
// The operation has been returned to the main io_context. The completion
// handler is ready to be delivered.
- // Take ownership of the operation's outstanding work.
- handler_work<Handler, IoExecutor> w(o->handler_, o->io_executor_);
-
BOOST_ASIO_HANDLER_COMPLETION((*o));
+ // Take ownership of the operation's outstanding work.
+ handler_work<Handler, IoExecutor> w(
+ BOOST_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
endpoint_type endpoint_;
scheduler_impl& scheduler_;
Handler handler_;
- IoExecutor io_executor_;
+ handler_work<Handler, IoExecutor> work_;
results_type results_;
};