passenger 6.0.20 → 6.0.21

data/src/cxx_supportlib/vendor-modified/boost/asio/execution/blocking_adaptation.hpp

@@ -2,7 +2,7 @@
 // execution/blocking_adaptation.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2023 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -19,10 +19,7 @@
 #include <boost/asio/detail/event.hpp>
 #include <boost/asio/detail/mutex.hpp>
 #include <boost/asio/detail/type_traits.hpp>
-#include <boost/asio/execution/execute.hpp>
 #include <boost/asio/execution/executor.hpp>
-#include <boost/asio/execution/scheduler.hpp>
-#include <boost/asio/execution/sender.hpp>
 #include <boost/asio/is_applicable_property.hpp>
 #include <boost/asio/prefer.hpp>
 #include <boost/asio/query.hpp>
@@ -48,11 +45,9 @@ namespace execution {
 /// allowed in order to apply the blocking_adaptation_t::allowed_t property.
 struct blocking_adaptation_t
 {
-  /// The blocking_adaptation_t property applies to executors, senders, and
-  /// schedulers.
+  /// The blocking_adaptation_t property applies to executors.
   template <typename T>
-  static constexpr bool is_applicable_property_v =
-    is_executor_v<T> || is_sender_v<T> || is_scheduler_v<T>;
+  static constexpr bool is_applicable_property_v = is_executor_v<T>;
 
   /// The top-level blocking_adaptation_t property cannot be required.
   static constexpr bool is_requirable = false;
@@ -66,11 +61,9 @@ struct blocking_adaptation_t
   /// A sub-property that indicates that automatic adaptation is not allowed.
   struct disallowed_t
   {
-    /// The blocking_adaptation_t::disallowed_t property applies to executors,
-    /// senders, and schedulers.
+    /// The blocking_adaptation_t::disallowed_t property applies to executors.
     template <typename T>
-    static constexpr bool is_applicable_property_v =
-      is_executor_v<T> || is_sender_v<T> || is_scheduler_v<T>;
+    static constexpr bool is_applicable_property_v = is_executor_v<T>;
 
     /// The blocking_adaptation_t::disallowed_t property can be required.
     static constexpr bool is_requirable = true;
@@ -94,11 +87,9 @@ struct blocking_adaptation_t
   /// A sub-property that indicates that automatic adaptation is allowed.
   struct allowed_t
   {
-    /// The blocking_adaptation_t::allowed_t property applies to executors,
-    /// senders, and schedulers.
+    /// The blocking_adaptation_t::allowed_t property applies to executors.
     template <typename T>
-    static constexpr bool is_applicable_property_v =
-      is_executor_v<T> || is_sender_v<T> || is_scheduler_v<T>;
+    static constexpr bool is_applicable_property_v = is_executor_v<T>;
 
     /// The blocking_adaptation_t::allowed_t property can be required.
     static constexpr bool is_requirable = true;
@@ -165,48 +156,28 @@ template <int I = 0>
 struct blocking_adaptation_t
 {
 #if defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
-# if defined(BOOST_ASIO_NO_DEPRECATED)
   template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value));
-# else // defined(BOOST_ASIO_NO_DEPRECATED)
-  template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_sender<T>
-          >::type::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_scheduler<T>
-          >::type::value
-      ));
-# endif // defined(BOOST_ASIO_NO_DEPRECATED)
+  static constexpr bool is_applicable_property_v = is_executor<T>::value;
 #endif // defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
 
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_requirable = false);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_preferable = false);
+  static constexpr bool is_requirable = false;
+  static constexpr bool is_preferable = false;
   typedef blocking_adaptation_t polymorphic_query_result_type;
 
   typedef detail::blocking_adaptation::disallowed_t<I> disallowed_t;
   typedef detail::blocking_adaptation::allowed_t<I> allowed_t;
 
-  BOOST_ASIO_CONSTEXPR blocking_adaptation_t()
+  constexpr blocking_adaptation_t()
     : value_(-1)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR blocking_adaptation_t(disallowed_t)
+  constexpr blocking_adaptation_t(disallowed_t)
     : value_(0)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR blocking_adaptation_t(allowed_t)
+  constexpr blocking_adaptation_t(allowed_t)
     : value_(1)
   {
   }
@@ -218,16 +189,14 @@ struct blocking_adaptation_t
     struct type
     {
       template <typename P>
-      auto query(BOOST_ASIO_MOVE_ARG(P) p) const
+      auto query(P&& p) const
         noexcept(
           noexcept(
-            declval<typename conditional<true, T, P>::type>().query(
-              BOOST_ASIO_MOVE_CAST(P)(p))
+            declval<conditional_t<true, T, P>>().query(static_cast<P&&>(p))
           )
         )
         -> decltype(
-          declval<typename conditional<true, T, P>::type>().query(
-            BOOST_ASIO_MOVE_CAST(P)(p))
+          declval<conditional_t<true, T, P>>().query(static_cast<P&&>(p))
         );
     };
 #else // defined(BOOST_ASIO_HAS_DEDUCED_QUERY_MEMBER_TRAIT)
@@ -242,17 +211,17 @@ struct blocking_adaptation_t
     struct type
     {
       template <typename P>
-      static constexpr auto query(BOOST_ASIO_MOVE_ARG(P) p)
+      static constexpr auto query(P&& p)
         noexcept(
           noexcept(
-            conditional<true, T, P>::type::query(BOOST_ASIO_MOVE_CAST(P)(p))
+            conditional_t<true, T, P>::query(static_cast<P&&>(p))
           )
         )
         -> decltype(
-          conditional<true, T, P>::type::query(BOOST_ASIO_MOVE_CAST(P)(p))
+          conditional_t<true, T, P>::query(static_cast<P&&>(p))
         )
       {
-        return T::query(BOOST_ASIO_MOVE_CAST(P)(p));
+        return T::query(static_cast<P&&>(p));
       }
     };
 #else // defined(BOOST_ASIO_HAS_DEDUCED_QUERY_STATIC_CONSTEXPR_MEMBER_TRAIT)
@@ -272,66 +241,64 @@ struct blocking_adaptation_t
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
-  typename query_static_constexpr_member<T>::result_type
+  static constexpr typename query_static_constexpr_member<T>::result_type
   static_query()
-    BOOST_ASIO_NOEXCEPT_IF((
-      query_static_constexpr_member<T>::is_noexcept))
+    noexcept(query_static_constexpr_member<T>::is_noexcept)
   {
     return query_static_constexpr_member<T>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, disallowed_t>::result_type
   static_query(
-      typename enable_if<
+      enable_if_t<
         !query_static_constexpr_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !query_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, disallowed_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, disallowed_t>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, allowed_t>::result_type
   static_query(
-      typename enable_if<
+      enable_if_t<
         !query_static_constexpr_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !query_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !traits::static_query<T, disallowed_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, allowed_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, allowed_t>::value();
   }
 
   template <typename E,
       typename T = decltype(blocking_adaptation_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = blocking_adaptation_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const blocking_adaptation_t& a, const blocking_adaptation_t& b)
   {
     return a.value_ == b.value_;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const blocking_adaptation_t& a, const blocking_adaptation_t& b)
   {
     return a.value_ != b.value_;
@@ -339,26 +306,24 @@ struct blocking_adaptation_t
 
   struct convertible_from_blocking_adaptation_t
   {
-    BOOST_ASIO_CONSTEXPR convertible_from_blocking_adaptation_t(
+    constexpr convertible_from_blocking_adaptation_t(
         blocking_adaptation_t)
     {
     }
   };
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR blocking_adaptation_t query(
+  friend constexpr blocking_adaptation_t query(
       const Executor& ex, convertible_from_blocking_adaptation_t,
-      typename enable_if<
+      enable_if_t<
         can_query<const Executor&, disallowed_t>::value
-      >::type* = 0)
+      >* = 0)
 #if !defined(__clang__) // Clang crashes if noexcept is used here.
 #if defined(BOOST_ASIO_MSVC) // Visual C++ wants the type to be qualified.
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&,
-        blocking_adaptation_t<>::disallowed_t>::value))
+    noexcept(is_nothrow_query<const Executor&,
+        blocking_adaptation_t<>::disallowed_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, disallowed_t>::value))
+    noexcept(is_nothrow_query<const Executor&, disallowed_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -366,22 +331,20 @@ struct blocking_adaptation_t
   }
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR blocking_adaptation_t query(
+  friend constexpr blocking_adaptation_t query(
       const Executor& ex, convertible_from_blocking_adaptation_t,
-      typename enable_if<
+      enable_if_t<
         !can_query<const Executor&, disallowed_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         can_query<const Executor&, allowed_t>::value
-      >::type* = 0)
+      >* = 0)
 #if !defined(__clang__) // Clang crashes if noexcept is used here.
 #if defined(BOOST_ASIO_MSVC) // Visual C++ wants the type to be qualified.
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&,
-        blocking_adaptation_t<>::allowed_t>::value))
+    noexcept(is_nothrow_query<const Executor&,
+        blocking_adaptation_t<>::allowed_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, allowed_t>::value))
+    noexcept(is_nothrow_query<const Executor&, allowed_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -391,10 +354,6 @@ struct blocking_adaptation_t
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(disallowed_t, disallowed);
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(allowed_t, allowed);
 
-#if !defined(BOOST_ASIO_HAS_CONSTEXPR)
-  static const blocking_adaptation_t instance;
-#endif // !defined(BOOST_ASIO_HAS_CONSTEXPR)
-
 private:
   int value_;
 };
@@ -406,11 +365,6 @@ const T blocking_adaptation_t<I>::static_query_v;
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-#if !defined(BOOST_ASIO_HAS_CONSTEXPR)
-template <int I>
-const blocking_adaptation_t<I> blocking_adaptation_t<I>::instance;
-#endif
-
 template <int I>
 const typename blocking_adaptation_t<I>::disallowed_t
 blocking_adaptation_t<I>::disallowed;
@@ -425,35 +379,15 @@ template <int I = 0>
 struct disallowed_t
 {
 #if defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
-# if defined(BOOST_ASIO_NO_DEPRECATED)
-  template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value));
-# else // defined(BOOST_ASIO_NO_DEPRECATED)
   template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_sender<T>
-          >::type::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_scheduler<T>
-          >::type::value
-      ));
-# endif // defined(BOOST_ASIO_NO_DEPRECATED)
+  static constexpr bool is_applicable_property_v = is_executor<T>::value;
 #endif // defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
 
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_requirable = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_preferable = true);
+  static constexpr bool is_requirable = true;
+  static constexpr bool is_preferable = true;
   typedef blocking_adaptation_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR disallowed_t()
+  constexpr disallowed_t()
   {
   }
 
@@ -472,55 +406,62 @@ struct disallowed_t
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename query_static_constexpr_member<T>::result_type
   static_query()
-    BOOST_ASIO_NOEXCEPT_IF((
-      query_static_constexpr_member<T>::is_noexcept))
+    noexcept(query_static_constexpr_member<T>::is_noexcept)
   {
     return query_static_constexpr_member<T>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR disallowed_t static_query(
-      typename enable_if<
+  static constexpr disallowed_t static_query(
+      enable_if_t<
         !query_static_constexpr_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !query_member<T>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !traits::query_free<T, disallowed_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
-        !can_query<T, allowed_t<I> >::value
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0,
+      enable_if_t<
+        !can_query<T, allowed_t<I>>::value
+      >* = 0) noexcept
   {
     return disallowed_t();
   }
 
   template <typename E, typename T = decltype(disallowed_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = disallowed_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR blocking_adaptation_t<I> value()
+  static constexpr blocking_adaptation_t<I> value()
   {
     return disallowed_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const disallowed_t&, const disallowed_t&)
+  friend constexpr bool operator==(const disallowed_t&, const disallowed_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const disallowed_t&, const disallowed_t&)
+  friend constexpr bool operator!=(const disallowed_t&, const disallowed_t&)
   {
     return false;
   }
+
+  friend constexpr bool operator==(const disallowed_t&, const allowed_t<I>&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator!=(const disallowed_t&, const allowed_t<I>&)
+  {
+    return true;
+  }
 };
 
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
@@ -534,113 +475,91 @@ template <typename Executor>
 class adapter
 {
 public:
-  adapter(int, const Executor& e) BOOST_ASIO_NOEXCEPT
+  adapter(int, const Executor& e) noexcept
     : executor_(e)
   {
   }
 
-  adapter(const adapter& other) BOOST_ASIO_NOEXCEPT
+  adapter(const adapter& other) noexcept
     : executor_(other.executor_)
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-  adapter(adapter&& other) BOOST_ASIO_NOEXCEPT
-    : executor_(BOOST_ASIO_MOVE_CAST(Executor)(other.executor_))
+  adapter(adapter&& other) noexcept
+    : executor_(static_cast<Executor&&>(other.executor_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR allowed_t<I> query(
-      blocking_adaptation_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr allowed_t<I> query(blocking_adaptation_t<I>) noexcept
   {
     return allowed_t<I>();
   }
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR allowed_t<I> query(
-      allowed_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr allowed_t<I> query(allowed_t<I>) noexcept
   {
     return allowed_t<I>();
   }
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR allowed_t<I> query(
-      disallowed_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr allowed_t<I> query(disallowed_t<I>) noexcept
   {
     return allowed_t<I>();
   }
 
   template <typename Property>
-  typename enable_if<
+  enable_if_t<
     can_query<const Executor&, Property>::value,
-    typename query_result<const Executor&, Property>::type
-  >::type query(const Property& p) const
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, Property>::value))
+    query_result_t<const Executor&, Property>
+  > query(const Property& p) const
+    noexcept(is_nothrow_query<const Executor&, Property>::value)
   {
     return boost::asio::query(executor_, p);
   }
 
   template <int I>
-  Executor require(disallowed_t<I>) const BOOST_ASIO_NOEXCEPT
+  Executor require(disallowed_t<I>) const noexcept
   {
     return executor_;
   }
 
   template <typename Property>
-  typename enable_if<
+  enable_if_t<
     can_require<const Executor&, Property>::value,
-    adapter<typename decay<
-      typename require_result<const Executor&, Property>::type
-    >::type>
-  >::type require(const Property& p) const
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_require<const Executor&, Property>::value))
+    adapter<decay_t<require_result_t<const Executor&, Property>>>
+  > require(const Property& p) const
+    noexcept(is_nothrow_require<const Executor&, Property>::value)
   {
-    return adapter<typename decay<
-      typename require_result<const Executor&, Property>::type
-        >::type>(0, boost::asio::require(executor_, p));
+    return adapter<decay_t<require_result_t<const Executor&, Property>>>(
+        0, boost::asio::require(executor_, p));
   }
 
   template <typename Property>
-  typename enable_if<
+  enable_if_t<
     can_prefer<const Executor&, Property>::value,
-    adapter<typename decay<
-      typename prefer_result<const Executor&, Property>::type
-    >::type>
-  >::type prefer(const Property& p) const
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_prefer<const Executor&, Property>::value))
+    adapter<decay_t<prefer_result_t<const Executor&, Property>>>
+  > prefer(const Property& p) const
+    noexcept(is_nothrow_prefer<const Executor&, Property>::value)
   {
-    return adapter<typename decay<
-      typename prefer_result<const Executor&, Property>::type
-        >::type>(0, boost::asio::prefer(executor_, p));
+    return adapter<decay_t<prefer_result_t<const Executor&, Property>>>(
+        0, boost::asio::prefer(executor_, p));
   }
 
   template <typename Function>
-  typename enable_if<
-#if defined(BOOST_ASIO_NO_DEPRECATED)
+  enable_if_t<
     traits::execute_member<const Executor&, Function>::is_valid
-#else // defined(BOOST_ASIO_NO_DEPRECATED)
-    execution::can_execute<const Executor&, Function>::value
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-  >::type execute(BOOST_ASIO_MOVE_ARG(Function) f) const
+  > execute(Function&& f) const
   {
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-    executor_.execute(BOOST_ASIO_MOVE_CAST(Function)(f));
-#else // defined(BOOST_ASIO_NO_DEPRECATED)
-    execution::execute(executor_, BOOST_ASIO_MOVE_CAST(Function)(f));
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
+    executor_.execute(static_cast<Function&&>(f));
   }
 
-  friend bool operator==(const adapter& a, const adapter& b) BOOST_ASIO_NOEXCEPT
+  friend bool operator==(const adapter& a, const adapter& b) noexcept
   {
     return a.executor_ == b.executor_;
   }
 
-  friend bool operator!=(const adapter& a, const adapter& b) BOOST_ASIO_NOEXCEPT
+  friend bool operator!=(const adapter& a, const adapter& b) noexcept
   {
     return a.executor_ != b.executor_;
   }
@@ -653,35 +572,15 @@ template <int I = 0>
 struct allowed_t
 {
 #if defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
-# if defined(BOOST_ASIO_NO_DEPRECATED)
   template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value));
-# else // defined(BOOST_ASIO_NO_DEPRECATED)
-  template <typename T>
-  BOOST_ASIO_STATIC_CONSTEXPR(bool,
-    is_applicable_property_v = (
-      is_executor<T>::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_sender<T>
-          >::type::value
-        || conditional<
-            is_executor<T>::value,
-            false_type,
-            is_scheduler<T>
-          >::type::value
-      ));
-# endif // defined(BOOST_ASIO_NO_DEPRECATED)
+  static constexpr bool is_applicable_property_v = is_executor<T>::value;
 #endif // defined(BOOST_ASIO_HAS_VARIABLE_TEMPLATES)
 
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_requirable = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_preferable = false);
+  static constexpr bool is_requirable = true;
+  static constexpr bool is_preferable = false;
   typedef blocking_adaptation_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR allowed_t()
+  constexpr allowed_t()
   {
   }
 
@@ -700,44 +599,49 @@ struct allowed_t
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
-  typename query_static_constexpr_member<T>::result_type
+  static constexpr typename query_static_constexpr_member<T>::result_type
   static_query()
-    BOOST_ASIO_NOEXCEPT_IF((
-      query_static_constexpr_member<T>::is_noexcept))
+    noexcept(query_static_constexpr_member<T>::is_noexcept)
   {
     return query_static_constexpr_member<T>::value();
   }
 
   template <typename E, typename T = decltype(allowed_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
-    = allowed_t::static_query<E>();
+  static constexpr const T static_query_v = allowed_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR blocking_adaptation_t<I> value()
+  static constexpr blocking_adaptation_t<I> value()
   {
     return allowed_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const allowed_t&, const allowed_t&)
+  friend constexpr bool operator==(const allowed_t&, const allowed_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const allowed_t&, const allowed_t&)
+  friend constexpr bool operator!=(const allowed_t&, const allowed_t&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator==(const allowed_t&, const disallowed_t<I>&)
   {
     return false;
   }
 
+  friend constexpr bool operator!=(const allowed_t&, const disallowed_t<I>&)
+  {
+    return true;
+  }
+
   template <typename Executor>
   friend adapter<Executor> require(
       const Executor& e, const allowed_t&,
-      typename enable_if<
+      enable_if_t<
         is_executor<Executor>::value
-      >::type* = 0)
+      >* = 0)
   {
     return adapter<Executor>(0, e);
   }
@@ -755,21 +659,17 @@ class blocking_execute_state
 {
 public:
   template <typename F>
-  blocking_execute_state(BOOST_ASIO_MOVE_ARG(F) f)
-    : func_(BOOST_ASIO_MOVE_CAST(F)(f)),
+  blocking_execute_state(F&& f)
+    : func_(static_cast<F&&>(f)),
       is_complete_(false)
   {
   }
 
   template <typename Executor>
-  void execute_and_wait(BOOST_ASIO_MOVE_ARG(Executor) ex)
+  void execute_and_wait(Executor&& ex)
   {
     handler h = { this };
-#if defined(BOOST_ASIO_NO_DEPRECATED)
     ex.execute(h);
-#else // defined(BOOST_ASIO_NO_DEPRECATED)
-    execution::execute(BOOST_ASIO_MOVE_CAST(Executor)(ex), h);
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
     boost::asio::detail::mutex::scoped_lock lock(mutex_);
     while (!is_complete_)
       event_.wait(lock);
@@ -806,11 +706,11 @@ public:
 
 template <typename Executor, typename Function>
 void blocking_execute(
-    BOOST_ASIO_MOVE_ARG(Executor) ex,
-    BOOST_ASIO_MOVE_ARG(Function) func)
+    Executor&& ex,
+    Function&& func)
 {
-  typedef typename decay<Function>::type func_t;
-  blocking_execute_state<func_t> state(BOOST_ASIO_MOVE_CAST(Function)(func));
+  typedef decay_t<Function> func_t;
+  blocking_execute_state<func_t> state(static_cast<Function&&>(func));
   state.execute_and_wait(ex);
 }
 
@@ -819,12 +719,7 @@ void blocking_execute(
 
 typedef detail::blocking_adaptation_t<> blocking_adaptation_t;
 
-#if defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
 constexpr blocking_adaptation_t blocking_adaptation;
-#else // defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
-namespace { static const blocking_adaptation_t&
-  blocking_adaptation = blocking_adaptation_t::instance; }
-#endif
 
 } // namespace execution
 
@@ -832,61 +727,19 @@ namespace { static const blocking_adaptation_t&
 
 template <typename T>
 struct is_applicable_property<T, execution::blocking_adaptation_t>
-  : integral_constant<bool,
-      execution::is_executor<T>::value
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_sender<T>
-          >::type::value
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_scheduler<T>
-          >::type::value
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-    >
+  : integral_constant<bool, execution::is_executor<T>::value>
 {
 };
 
 template <typename T>
 struct is_applicable_property<T, execution::blocking_adaptation_t::disallowed_t>
-  : integral_constant<bool,
-      execution::is_executor<T>::value
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_sender<T>
-          >::type::value
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_scheduler<T>
-          >::type::value
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-    >
+  : integral_constant<bool, execution::is_executor<T>::value>
 {
 };
 
 template <typename T>
 struct is_applicable_property<T, execution::blocking_adaptation_t::allowed_t>
-  : integral_constant<bool,
-      execution::is_executor<T>::value
-#if !defined(BOOST_ASIO_NO_DEPRECATED)
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_sender<T>
-          >::type::value
-        || conditional<
-            execution::is_executor<T>::value,
-            false_type,
-            execution::is_scheduler<T>
-          >::type::value
-#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
-    >
+  : integral_constant<bool, execution::is_executor<T>::value>
 {
 };
 
@@ -898,27 +751,27 @@ namespace traits {
 
 template <typename T>
 struct query_free_default<T, execution::blocking_adaptation_t,
-  typename enable_if<
+  enable_if_t<
     can_query<T, execution::blocking_adaptation_t::disallowed_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = (is_nothrow_query<T,
-      execution::blocking_adaptation_t::disallowed_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::blocking_adaptation_t::disallowed_t>::value;
 
   typedef execution::blocking_adaptation_t result_type;
 };
 
 template <typename T>
 struct query_free_default<T, execution::blocking_adaptation_t,
-  typename enable_if<
+  enable_if_t<
     !can_query<T, execution::blocking_adaptation_t::disallowed_t>::value
       && can_query<T, execution::blocking_adaptation_t::allowed_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::blocking_adaptation_t::allowed_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::blocking_adaptation_t::allowed_t>::value;
 
   typedef execution::blocking_adaptation_t result_type;
 };
@@ -930,18 +783,18 @@ struct query_free_default<T, execution::blocking_adaptation_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking_adaptation_t<0>::
       query_static_constexpr_member<T>::is_valid
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef typename execution::detail::blocking_adaptation_t<0>::
     query_static_constexpr_member<T>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return execution::detail::blocking_adaptation_t<0>::
       query_static_constexpr_member<T>::value();
@@ -950,22 +803,22 @@ struct static_query<T, execution::blocking_adaptation_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_adaptation_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_adaptation_t<0>::
         query_member<T>::is_valid
       && traits::static_query<T,
         execution::blocking_adaptation_t::disallowed_t>::is_valid
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef typename traits::static_query<T,
     execution::blocking_adaptation_t::disallowed_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T,
         execution::blocking_adaptation_t::disallowed_t>::value();
@@ -974,7 +827,7 @@ struct static_query<T, execution::blocking_adaptation_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_adaptation_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_adaptation_t<0>::
@@ -983,15 +836,15 @@ struct static_query<T, execution::blocking_adaptation_t,
         execution::blocking_adaptation_t::disallowed_t>::is_valid
       && traits::static_query<T,
         execution::blocking_adaptation_t::allowed_t>::is_valid
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef typename traits::static_query<T,
     execution::blocking_adaptation_t::allowed_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T,
         execution::blocking_adaptation_t::allowed_t>::value();
@@ -1000,18 +853,18 @@ struct static_query<T, execution::blocking_adaptation_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t::disallowed_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking_adaptation::disallowed_t<0>::
       query_static_constexpr_member<T>::is_valid
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef typename execution::detail::blocking_adaptation::disallowed_t<0>::
     query_static_constexpr_member<T>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return execution::detail::blocking_adaptation::disallowed_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1020,7 +873,7 @@ struct static_query<T, execution::blocking_adaptation_t::disallowed_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t::disallowed_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_adaptation::disallowed_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_adaptation::disallowed_t<0>::
@@ -1028,14 +881,14 @@ struct static_query<T, execution::blocking_adaptation_t::disallowed_t,
       && !traits::query_free<T,
         execution::blocking_adaptation_t::disallowed_t>::is_valid
       && !can_query<T, execution::blocking_adaptation_t::allowed_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef execution::blocking_adaptation_t::disallowed_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return result_type();
   }
@@ -1043,18 +896,18 @@ struct static_query<T, execution::blocking_adaptation_t::disallowed_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_adaptation_t::allowed_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking_adaptation::allowed_t<0>::
       query_static_constexpr_member<T>::is_valid
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 
   typedef typename execution::detail::blocking_adaptation::allowed_t<0>::
     query_static_constexpr_member<T>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return execution::detail::blocking_adaptation::allowed_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1064,45 +917,17 @@ struct static_query<T, execution::blocking_adaptation_t::allowed_t,
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   || !defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-#if !defined(BOOST_ASIO_HAS_DEDUCED_STATIC_REQUIRE_TRAIT)
-
-template <typename T>
-struct static_require<T, execution::blocking_adaptation_t::disallowed_t,
-  typename enable_if<
-    static_query<T, execution::blocking_adaptation_t::disallowed_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::blocking_adaptation_t::disallowed_t>::result_type,
-        execution::blocking_adaptation_t::disallowed_t>::value));
-};
-
-template <typename T>
-struct static_require<T, execution::blocking_adaptation_t::allowed_t,
-  typename enable_if<
-    static_query<T, execution::blocking_adaptation_t::allowed_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::blocking_adaptation_t::allowed_t>::result_type,
-        execution::blocking_adaptation_t::allowed_t>::value));
-};
-
-#endif // !defined(BOOST_ASIO_HAS_DEDUCED_STATIC_REQUIRE_TRAIT)
-
 #if !defined(BOOST_ASIO_HAS_DEDUCED_REQUIRE_FREE_TRAIT)
 
 template <typename T>
 struct require_free_default<T, execution::blocking_adaptation_t::allowed_t,
-  typename enable_if<
-    is_same<T, typename decay<T>::type>::value
+  enable_if_t<
+    is_same<T, decay_t<T>>::value
       && execution::is_executor<T>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = false);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = false;
   typedef execution::detail::blocking_adaptation::adapter<T> result_type;
 };
 
@@ -1112,10 +937,10 @@ struct require_free_default<T, execution::blocking_adaptation_t::allowed_t,
 
 template <typename Executor>
 struct equality_comparable<
-  execution::detail::blocking_adaptation::adapter<Executor> >
+  execution::detail::blocking_adaptation::adapter<Executor>>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_EQUALITY_COMPARABLE_TRAIT)
@@ -1126,8 +951,8 @@ template <typename Executor, typename Function>
 struct execute_member<
   execution::detail::blocking_adaptation::adapter<Executor>, Function>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = false);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = false;
   typedef void result_type;
 };
 
@@ -1138,13 +963,13 @@ struct execute_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking_adaptation::adapter<Executor>,
-  execution::detail::blocking_adaptation_t<I> >
+  execution::detail::blocking_adaptation_t<I>>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
   typedef execution::blocking_adaptation_t::allowed_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1153,13 +978,13 @@ struct query_static_constexpr_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking_adaptation::adapter<Executor>,
-  execution::detail::blocking_adaptation::allowed_t<I> >
+  execution::detail::blocking_adaptation::allowed_t<I>>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
   typedef execution::blocking_adaptation_t::allowed_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1168,13 +993,13 @@ struct query_static_constexpr_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking_adaptation::adapter<Executor>,
-  execution::detail::blocking_adaptation::disallowed_t<I> >
+  execution::detail::blocking_adaptation::disallowed_t<I>>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
   typedef execution::blocking_adaptation_t::allowed_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1187,14 +1012,14 @@ struct query_static_constexpr_member<
 template <typename Executor, typename Property>
 struct query_member<
   execution::detail::blocking_adaptation::adapter<Executor>, Property,
-  typename enable_if<
+  enable_if_t<
     can_query<const Executor&, Property>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-      (is_nothrow_query<Executor, Property>::value));
-  typedef typename query_result<Executor, Property>::type result_type;
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<Executor, Property>::value;
+  typedef query_result_t<Executor, Property> result_type;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_QUERY_MEMBER_TRAIT)
@@ -1204,26 +1029,25 @@ struct query_member<
 template <typename Executor, int I>
 struct require_member<
   execution::detail::blocking_adaptation::adapter<Executor>,
-  execution::detail::blocking_adaptation::disallowed_t<I> >
+  execution::detail::blocking_adaptation::disallowed_t<I>>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept = true);
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept = true;
   typedef Executor result_type;
 };
 
 template <typename Executor, typename Property>
 struct require_member<
   execution::detail::blocking_adaptation::adapter<Executor>, Property,
-  typename enable_if<
+  enable_if_t<
     can_require<const Executor&, Property>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-      (is_nothrow_require<Executor, Property>::value));
-  typedef execution::detail::blocking_adaptation::adapter<typename decay<
-    typename require_result<Executor, Property>::type
-      >::type> result_type;
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_require<Executor, Property>::value;
+  typedef execution::detail::blocking_adaptation::adapter<
+    decay_t<require_result_t<Executor, Property>>> result_type;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_REQUIRE_MEMBER_TRAIT)
@@ -1233,16 +1057,15 @@ struct require_member<
 template <typename Executor, typename Property>
 struct prefer_member<
   execution::detail::blocking_adaptation::adapter<Executor>, Property,
-  typename enable_if<
+  enable_if_t<
     can_prefer<const Executor&, Property>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-      (is_nothrow_prefer<Executor, Property>::value));
-  typedef execution::detail::blocking_adaptation::adapter<typename decay<
-    typename prefer_result<Executor, Property>::type
-      >::type> result_type;
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_prefer<Executor, Property>::value;
+  typedef execution::detail::blocking_adaptation::adapter<
+    decay_t<prefer_result_t<Executor, Property>>> result_type;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_PREFER_MEMBER_TRAIT)