import quincy beta 17.1.0

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

diff --git a/ceph/src/boost/boost/asio/dispatch.hpp b/ceph/src/boost/boost/asio/dispatch.hpp
index 77eefcaefda325d64e0ee28c57ff3f4a1faaeb70..bf278f13033b63fa5e6a43b089506149552585e8 100644 (file)
--- a/ceph/src/boost/boost/asio/dispatch.hpp
+++ b/ceph/src/boost/boost/asio/dispatch.hpp
@@ -19,6 +19,7 @@
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/execution_context.hpp>
+#include <boost/asio/execution/executor.hpp>
 #include <boost/asio/is_executor.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
@@ -91,7 +92,9 @@ BOOST_ASIO_INITFN_AUTO_RESULT_TYPE(CompletionToken, void()) dispatch(
     const Executor& ex,
     BOOST_ASIO_MOVE_ARG(CompletionToken) token
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(Executor),
-    typename enable_if<is_executor<Executor>::value>::type* = 0);
+    typename enable_if<
+      execution::is_executor<Executor>::value || is_executor<Executor>::value
+    >::type* = 0);
 
 /// Submits a completion token or function object for execution.
 /**