import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / detail / reactive_wait_op.hpp

diff --git a/ceph/src/boost/boost/asio/detail/reactive_wait_op.hpp b/ceph/src/boost/boost/asio/detail/reactive_wait_op.hpp
index f8b1b18d634effcae0086481496a859db2df9a46..424c28a1b97c0cee30b89961450dd5a172506f12 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/reactive_wait_op.hpp
+++ b/ceph/src/boost/boost/asio/detail/reactive_wait_op.hpp
@@ -16,9 +16,11 @@
 #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/reactor_op.hpp>
 
@@ -34,13 +36,13 @@ class reactive_wait_op : public reactor_op
 public:
   BOOST_ASIO_DEFINE_HANDLER_PTR(reactive_wait_op);
 
-  reactive_wait_op(Handler& handler, const IoExecutor& io_ex)
-    : reactor_op(&reactive_wait_op::do_perform,
+  reactive_wait_op(const boost::system::error_code& success_ec,
+      Handler& handler, const IoExecutor& io_ex)
+    : reactor_op(success_ec, &reactive_wait_op::do_perform,
         &reactive_wait_op::do_complete),
       handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
-      io_executor_(io_ex)
+      work_(handler_, io_ex)
   {
-    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static status do_perform(reactor_op*)
@@ -55,10 +57,14 @@ public:
     // Take ownership of the handler object.
     reactive_wait_op* o(static_cast<reactive_wait_op*>(base));
     ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
-    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 associated
@@ -82,7 +88,7 @@ public:
 
 private:
   Handler handler_;
-  IoExecutor io_executor_;
+  handler_work<Handler, IoExecutor> work_;
 };
 
 } // namespace detail