import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / posix / basic_descriptor.hpp

diff --git a/ceph/src/boost/boost/asio/posix/basic_descriptor.hpp b/ceph/src/boost/boost/asio/posix/basic_descriptor.hpp
index f5b970336dd2a2935df7f81065c43071be9b2b86..ad71f90a01a604670b7a13177245229a671aac2b 100644 (file)
--- a/ceph/src/boost/boost/asio/posix/basic_descriptor.hpp
+++ b/ceph/src/boost/boost/asio/posix/basic_descriptor.hpp
@@ -20,6 +20,7 @@
 #if defined(BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR) \
   || defined(GENERATING_DOCUMENTATION)
 
+#include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/handler_type_requirements.hpp>
 #include <boost/asio/detail/io_object_impl.hpp>
@@ -28,7 +29,6 @@
 #include <boost/asio/detail/throw_error.hpp>
 #include <boost/asio/error.hpp>
 #include <boost/asio/execution_context.hpp>
-#include <boost/asio/executor.hpp>
 #include <boost/asio/posix/descriptor_base.hpp>
 
 #if defined(BOOST_ASIO_HAS_MOVE)
@@ -50,7 +50,7 @@ namespace posix {
  * @e Distinct @e objects: Safe.@n
  * @e Shared @e objects: Unsafe.
  */
-template <typename Executor = executor>
+template <typename Executor = any_io_executor>
 class basic_descriptor
   : public descriptor_base
 {
@@ -678,8 +678,8 @@ private:
 
       detail::non_const_lvalue<WaitHandler> handler2(handler);
       self_->impl_.get_service().async_wait(
-          self_->impl_.get_implementation(), w, handler2.value,
-          self_->impl_.get_implementation_executor());
+          self_->impl_.get_implementation(), w,
+          handler2.value, self_->impl_.get_executor());
     }
 
   private: