update boost
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// detail/wait_handler.hpp
|
||||
// ~~~~~~~~~~~~~~~~~~~~~~~
|
||||
//
|
||||
// Copyright (c) 2003-2019 Christopher M. Kohlhoff (chris at kohlhoff dot com)
|
||||
// Copyright (c) 2003-2023 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)
|
||||
@@ -16,9 +16,9 @@
|
||||
#endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
|
||||
|
||||
#include <boost/asio/detail/config.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/wait_op.hpp>
|
||||
@@ -35,12 +35,11 @@ class wait_handler : public wait_op
|
||||
public:
|
||||
BOOST_ASIO_DEFINE_HANDLER_PTR(wait_handler);
|
||||
|
||||
wait_handler(Handler& h, const IoExecutor& ex)
|
||||
wait_handler(Handler& h, const IoExecutor& io_ex)
|
||||
: wait_op(&wait_handler::do_complete),
|
||||
handler_(BOOST_ASIO_MOVE_CAST(Handler)(h)),
|
||||
io_executor_(ex)
|
||||
work_(handler_, io_ex)
|
||||
{
|
||||
handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
|
||||
}
|
||||
|
||||
static void do_complete(void* owner, operation* base,
|
||||
@@ -50,10 +49,14 @@ public:
|
||||
// Take ownership of the handler object.
|
||||
wait_handler* h(static_cast<wait_handler*>(base));
|
||||
ptr p = { boost::asio::detail::addressof(h->handler_), h, h };
|
||||
handler_work<Handler, IoExecutor> w(h->handler_, h->io_executor_);
|
||||
|
||||
BOOST_ASIO_HANDLER_COMPLETION((*h));
|
||||
|
||||
// Take ownership of the operation's outstanding work.
|
||||
handler_work<Handler, IoExecutor> w(
|
||||
BOOST_ASIO_MOVE_CAST2(handler_work<Handler, IoExecutor>)(
|
||||
h->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
|
||||
@@ -77,7 +80,7 @@ public:
|
||||
|
||||
private:
|
||||
Handler handler_;
|
||||
IoExecutor io_executor_;
|
||||
handler_work<Handler, IoExecutor> work_;
|
||||
};
|
||||
|
||||
} // namespace detail
|
||||
|
||||
Reference in New Issue
Block a user