import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / asio / windows / overlapped_ptr.hpp

diff --git a/ceph/src/boost/boost/asio/windows/overlapped_ptr.hpp b/ceph/src/boost/boost/asio/windows/overlapped_ptr.hpp
index f8e6407e9d13d3fbe538ff30faad3b6d3d8d15ad..4dd487c699d7f365f00cf356b6c1071135a737e3 100644 (file)
--- a/ceph/src/boost/boost/asio/windows/overlapped_ptr.hpp
+++ b/ceph/src/boost/boost/asio/windows/overlapped_ptr.hpp
@@ -65,7 +65,8 @@ public:
   explicit overlapped_ptr(const Executor& ex,
       BOOST_ASIO_MOVE_ARG(Handler) handler,
       typename enable_if<
-        is_executor<Executor>::value
+        execution::is_executor<Executor>::value
+          || is_executor<Executor>::value
       >::type* = 0)
     : impl_(ex, BOOST_ASIO_MOVE_CAST(Handler)(handler))
   {
@@ -98,7 +99,8 @@ public:
   template <typename Executor, typename Handler>
   void reset(const Executor& ex, BOOST_ASIO_MOVE_ARG(Handler) handler,
       typename enable_if<
-        is_executor<Executor>::value
+        execution::is_executor<Executor>::value
+          || is_executor<Executor>::value
       >::type* = 0)
   {
     impl_.reset(ex, BOOST_ASIO_MOVE_CAST(Handler)(handler));