import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/boost/asio/basic_deadline_timer.hpp b/ceph/src/boost/boost/asio/basic_deadline_timer.hpp
index 181c7d1dbfea04c67898941844353f0b47f39b51..3373036439001ba404822b0deb007f2c4e36a995 100644 (file)
--- a/ceph/src/boost/boost/asio/basic_deadline_timer.hpp
+++ b/ceph/src/boost/boost/asio/basic_deadline_timer.hpp
@@ -21,6 +21,7 @@
   || defined(GENERATING_DOCUMENTATION)
 
 #include <cstddef>
+#include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/detail/deadline_timer_service.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/time_traits.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -126,7 +126,7 @@ namespace asio {
  */
 template <typename Time,
     typename TimeTraits = boost::asio::time_traits<Time>,
-    typename Executor = executor>
+    typename Executor = any_io_executor>
 class basic_deadline_timer
 {
 public:
@@ -672,8 +672,8 @@ private:
 
       detail::non_const_lvalue<WaitHandler> handler2(handler);
       self_->impl_.get_service().async_wait(
-          self_->impl_.get_implementation(), handler2.value,
-          self_->impl_.get_implementation_executor());
+          self_->impl_.get_implementation(),
+          handler2.value, self_->impl_.get_executor());
     }
 
   private: