import new upstream nautilus stable release 14.2.8

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

diff --git a/ceph/src/boost/boost/asio/detail/reactive_socket_recvmsg_op.hpp b/ceph/src/boost/boost/asio/detail/reactive_socket_recvmsg_op.hpp
index 6ae324947c58aed0c143f0cf6a26aa8b7a1c89ea..bb65a19cf4595997df46230ec50b202e2133568b 100644 (file)
--- a/ceph/src/boost/boost/asio/detail/reactive_socket_recvmsg_op.hpp
+++ b/ceph/src/boost/boost/asio/detail/reactive_socket_recvmsg_op.hpp
@@ -2,7 +2,7 @@
 // detail/reactive_socket_recvmsg_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2019 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)
@@ -71,7 +71,7 @@ private:
   socket_base::message_flags& out_flags_;
 };
 
-template <typename MutableBufferSequence, typename Handler>
+template <typename MutableBufferSequence, typename Handler, typename IoExecutor>
 class reactive_socket_recvmsg_op :
   public reactive_socket_recvmsg_op_base<MutableBufferSequence>
 {
@@ -80,12 +80,14 @@ public:
 
   reactive_socket_recvmsg_op(socket_type socket,
       const MutableBufferSequence& buffers, socket_base::message_flags in_flags,
-      socket_base::message_flags& out_flags, Handler& handler)
+      socket_base::message_flags& out_flags, Handler& handler,
+      const IoExecutor& io_ex)
     : reactive_socket_recvmsg_op_base<MutableBufferSequence>(socket, buffers,
         in_flags, out_flags, &reactive_socket_recvmsg_op::do_complete),
-      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler))
+      handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+      io_executor_(io_ex)
   {
-    handler_work<Handler>::start(handler_);
+    handler_work<Handler, IoExecutor>::start(handler_, io_executor_);
   }
 
   static void do_complete(void* owner, operation* base,
@@ -96,7 +98,7 @@ public:
     reactive_socket_recvmsg_op* o(
         static_cast<reactive_socket_recvmsg_op*>(base));
     ptr p = { boost::asio::detail::addressof(o->handler_), o, o };
-    handler_work<Handler> w(o->handler_);
+    handler_work<Handler, IoExecutor> w(o->handler_, o->io_executor_);
 
     BOOST_ASIO_HANDLER_COMPLETION((*o));
 
@@ -123,6 +125,7 @@ public:
 
 private:
   Handler handler_;
+  IoExecutor io_executor_;
 };
 
 } // namespace detail