X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Fboost%2Fasio%2Fdetail%2Fwin_iocp_socket_recvmsg_op.hpp;h=73127dca8020a2d0bce8e22ecc76cab4f99697de;hb=92f5a8d42d07f9929ae4fa7e01342fe8d96808a8;hp=4a8313225d3f1d60c665e36b2439f37facd333f6;hpb=a0324939f9d0e1905d5df8f57442f09dc70af83d;p=ceph.git

diff --git a/ceph/src/boost/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp b/ceph/src/boost/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
index 4a8313225..73127dca8 100644
--- a/ceph/src/boost/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
+++ b/ceph/src/boost/boost/asio/detail/win_iocp_socket_recvmsg_op.hpp
@@ -2,7 +2,7 @@
 // detail/win_iocp_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)
@@ -36,7 +36,7 @@ namespace boost {
 namespace asio {
 namespace detail {
 
-template <typename MutableBufferSequence, typename Handler>
+template <typename MutableBufferSequence, typename Handler, typename IoExecutor>
 class win_iocp_socket_recvmsg_op : public operation
 {
 public:
@@ -45,14 +45,16 @@ public:
   win_iocp_socket_recvmsg_op(
       socket_ops::weak_cancel_token_type cancel_token,
       const MutableBufferSequence& buffers,
-      socket_base::message_flags& out_flags, Handler& handler)
+      socket_base::message_flags& out_flags,
+      Handler& handler, const IoExecutor& io_ex)
     : operation(&win_iocp_socket_recvmsg_op::do_complete),
       cancel_token_(cancel_token),
       buffers_(buffers),
       out_flags_(out_flags),
-      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,
@@ -65,7 +67,7 @@ public:
     win_iocp_socket_recvmsg_op* o(
         static_cast<win_iocp_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));
 
@@ -107,6 +109,7 @@ private:
   MutableBufferSequence buffers_;
   socket_base::message_flags& out_flags_;
   Handler handler_;
+  IoExecutor io_executor_;
 };
 
 } // namespace detail