import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / basic_seq_packet_socket.hpp

diff --git a/ceph/src/boost/boost/asio/basic_seq_packet_socket.hpp b/ceph/src/boost/boost/asio/basic_seq_packet_socket.hpp
index 6ceca2e6ed01ac0620bf1de7df0c7bfca8580807..82e751695e12a0ccf9be4bc1d20189ece3f52113 100644 (file)
--- a/ceph/src/boost/boost/asio/basic_seq_packet_socket.hpp
+++ b/ceph/src/boost/boost/asio/basic_seq_packet_socket.hpp
@@ -31,7 +31,7 @@ namespace asio {
 #define BOOST_ASIO_BASIC_SEQ_PACKET_SOCKET_FWD_DECL
 
 // Forward declaration with defaulted arguments.
-template <typename Protocol, typename Executor = executor>
+template <typename Protocol, typename Executor = any_io_executor>
 class basic_seq_packet_socket;
 
 #endif // !defined(BOOST_ASIO_BASIC_SEQ_PACKET_SOCKET_FWD_DECL)
@@ -680,6 +680,11 @@ public:
   }
 
 private:
+  // Disallow copying and assignment.
+  basic_seq_packet_socket(const basic_seq_packet_socket&) BOOST_ASIO_DELETED;
+  basic_seq_packet_socket& operator=(
+      const basic_seq_packet_socket&) BOOST_ASIO_DELETED;
+
   class initiate_async_send
   {
   public:
@@ -707,7 +712,7 @@ private:
       detail::non_const_lvalue<WriteHandler> handler2(handler);
       self_->impl_.get_service().async_send(
           self_->impl_.get_implementation(), buffers, flags,
-          handler2.value, self_->impl_.get_implementation_executor());
+          handler2.value, self_->impl_.get_executor());
     }
 
   private:
@@ -741,8 +746,8 @@ private:
 
       detail::non_const_lvalue<ReadHandler> handler2(handler);
       self_->impl_.get_service().async_receive_with_flags(
-          self_->impl_.get_implementation(), buffers, in_flags, *out_flags,
-          handler2.value, self_->impl_.get_implementation_executor());
+          self_->impl_.get_implementation(), buffers, in_flags,
+          *out_flags, handler2.value, self_->impl_.get_executor());
     }
 
   private: