passenger 6.0.20 → 6.0.21

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

@@ -2,7 +2,7 @@
 // execution/blocking.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)
@@ -17,10 +17,7 @@
 
 #include <boost/asio/detail/config.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>
@@ -45,10 +42,9 @@ namespace execution {
 /// behaviour of their execution functions.
 struct blocking_t
 {
-  /// The blocking_t property applies to executors, senders, and schedulers.
+  /// The blocking_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_t property cannot be required.
   static constexpr bool is_requirable = false;
@@ -64,11 +60,9 @@ struct blocking_t
   /// submitted function object.
   struct possibly_t
   {
-    /// The blocking_t::possibly_t property applies to executors, senders, and
-    /// schedulers.
+    /// The blocking_t::possibly_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_t::possibly_t property can be required.
     static constexpr bool is_requirable = true;
@@ -94,11 +88,9 @@ struct blocking_t
   /// function object.
   struct always_t
   {
-    /// The blocking_t::always_t property applies to executors, senders, and
-    /// schedulers.
+    /// The blocking_t::always_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_t::always_t property can be required.
     static constexpr bool is_requirable = true;
@@ -124,11 +116,9 @@ struct blocking_t
   /// submitted function object.
   struct never_t
   {
-    /// The blocking_t::never_t property applies to executors, senders, and
-    /// schedulers.
+    /// The blocking_t::never_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_t::never_t property can be required.
     static constexpr bool is_requirable = true;
@@ -201,8 +191,8 @@ template <int I> struct allowed_t;
 
 template <typename Executor, typename Function>
 void blocking_execute(
-    BOOST_ASIO_MOVE_ARG(Executor) ex,
-    BOOST_ASIO_MOVE_ARG(Function) func);
+    Executor&& ex,
+    Function&& func);
 
 } // namespace blocking_adaptation
 
@@ -210,54 +200,34 @@ template <int I = 0>
 struct blocking_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_t polymorphic_query_result_type;
 
   typedef detail::blocking::possibly_t<I> possibly_t;
   typedef detail::blocking::always_t<I> always_t;
   typedef detail::blocking::never_t<I> never_t;
 
-  BOOST_ASIO_CONSTEXPR blocking_t()
+  constexpr blocking_t()
     : value_(-1)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR blocking_t(possibly_t)
+  constexpr blocking_t(possibly_t)
     : value_(0)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR blocking_t(always_t)
+  constexpr blocking_t(always_t)
     : value_(1)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR blocking_t(never_t)
+  constexpr blocking_t(never_t)
     : value_(2)
   {
   }
@@ -269,16 +239,14 @@ struct blocking_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)
@@ -293,17 +261,17 @@ struct blocking_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)
@@ -323,88 +291,87 @@ struct blocking_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
+  static constexpr
   typename traits::static_query<T, possibly_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, possibly_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, possibly_t>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, always_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, possibly_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, always_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, always_t>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, never_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, possibly_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !traits::static_query<T, always_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, never_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, never_t>::value();
   }
 
   template <typename E, typename T = decltype(blocking_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = blocking_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_t& a, const blocking_t& b)
   {
     return a.value_ == b.value_;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const blocking_t& a, const blocking_t& b)
   {
     return a.value_ != b.value_;
@@ -412,22 +379,20 @@ struct blocking_t
 
   struct convertible_from_blocking_t
   {
-    BOOST_ASIO_CONSTEXPR convertible_from_blocking_t(blocking_t) {}
+    constexpr convertible_from_blocking_t(blocking_t) {}
   };
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR blocking_t query(
+  friend constexpr blocking_t query(
       const Executor& ex, convertible_from_blocking_t,
-      typename enable_if<
+      enable_if_t<
         can_query<const Executor&, possibly_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_t<>::possibly_t>::value))
+    noexcept(is_nothrow_query<const Executor&, blocking_t<>::possibly_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, possibly_t>::value))
+    noexcept(is_nothrow_query<const Executor&, possibly_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -435,21 +400,19 @@ struct blocking_t
   }
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR blocking_t query(
+  friend constexpr blocking_t query(
       const Executor& ex, convertible_from_blocking_t,
-      typename enable_if<
+      enable_if_t<
         !can_query<const Executor&, possibly_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         can_query<const Executor&, always_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_t<>::always_t>::value))
+    noexcept(is_nothrow_query<const Executor&, blocking_t<>::always_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, always_t>::value))
+    noexcept(is_nothrow_query<const Executor&, always_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -457,24 +420,22 @@ struct blocking_t
   }
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR blocking_t query(
+  friend constexpr blocking_t query(
       const Executor& ex, convertible_from_blocking_t,
-      typename enable_if<
+      enable_if_t<
         !can_query<const Executor&, possibly_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !can_query<const Executor&, always_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         can_query<const Executor&, never_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_t<>::never_t>::value))
+    noexcept(is_nothrow_query<const Executor&, blocking_t<>::never_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, never_t>::value))
+    noexcept(is_nothrow_query<const Executor&, never_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -485,10 +446,6 @@ struct blocking_t
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(always_t, always);
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(never_t, never);
 
-#if !defined(BOOST_ASIO_HAS_CONSTEXPR)
-  static const blocking_t instance;
-#endif // !defined(BOOST_ASIO_HAS_CONSTEXPR)
-
 private:
   int value_;
 };
@@ -500,11 +457,6 @@ const T blocking_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_t<I> blocking_t<I>::instance;
-#endif
-
 template <int I>
 const typename blocking_t<I>::possibly_t blocking_t<I>::possibly;
 
@@ -520,35 +472,15 @@ template <int I = 0>
 struct possibly_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_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR possibly_t()
+  constexpr possibly_t()
   {
   }
 
@@ -565,78 +497,77 @@ struct possibly_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 possibly_t static_query(
-      typename enable_if<
+  static constexpr possibly_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, possibly_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
-        !can_query<T, always_t<I> >::value
-      >::type* = 0,
-      typename enable_if<
-        !can_query<T, never_t<I> >::value
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0,
+      enable_if_t<
+        !can_query<T, always_t<I>>::value
+      >* = 0,
+      enable_if_t<
+        !can_query<T, never_t<I>>::value
+      >* = 0) noexcept
   {
     return possibly_t();
   }
 
   template <typename E, typename T = decltype(possibly_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = possibly_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR blocking_t<I> value()
+  static constexpr blocking_t<I> value()
   {
     return possibly_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const possibly_t&, const possibly_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const possibly_t&, const possibly_t&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const possibly_t&, const always_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const possibly_t&, const always_t<I>&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const possibly_t&, const never_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const possibly_t&, const never_t<I>&)
   {
     return true;
@@ -654,129 +585,110 @@ 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 always_t<I> query(
-      blocking_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr always_t<I> query(blocking_t<I>) noexcept
   {
     return always_t<I>();
   }
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR always_t<I> query(
-      possibly_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr always_t<I> query(possibly_t<I>) noexcept
   {
     return always_t<I>();
   }
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR always_t<I> query(
-      always_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr always_t<I> query(always_t<I>) noexcept
   {
     return always_t<I>();
   }
 
   template <int I>
-  static BOOST_ASIO_CONSTEXPR always_t<I> query(
-      never_t<I>) BOOST_ASIO_NOEXCEPT
+  static constexpr always_t<I> query(never_t<I>) noexcept
   {
     return always_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>
-  typename enable_if<
-    can_require<const Executor&, possibly_t<I> >::value,
-    typename require_result<const Executor&, possibly_t<I> >::type
-  >::type require(possibly_t<I>) const BOOST_ASIO_NOEXCEPT
+  enable_if_t<
+    can_require<const Executor&, possibly_t<I>>::value,
+    require_result_t<const Executor&, possibly_t<I>>
+  > require(possibly_t<I>) const noexcept
   {
     return boost::asio::require(executor_, possibly_t<I>());
   }
 
   template <int I>
-  typename enable_if<
-    can_require<const Executor&, never_t<I> >::value,
-    typename require_result<const Executor&, never_t<I> >::type
-  >::type require(never_t<I>) const BOOST_ASIO_NOEXCEPT
+  enable_if_t<
+    can_require<const Executor&, never_t<I>>::value,
+    require_result_t<const Executor&, never_t<I>>
+  > require(never_t<I>) const noexcept
   {
     return boost::asio::require(executor_, never_t<I>());
   }
 
   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
   {
     blocking_adaptation::blocking_execute(
-        executor_, BOOST_ASIO_MOVE_CAST(Function)(f));
+        executor_, 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_;
   }
@@ -789,35 +701,15 @@ template <int I = 0>
 struct always_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_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR always_t()
+  constexpr always_t()
   {
   }
 
@@ -834,57 +726,54 @@ struct always_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(always_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
-    = always_t::static_query<E>();
+  static constexpr const T static_query_v = always_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR blocking_t<I> value()
+  static constexpr blocking_t<I> value()
   {
     return always_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const always_t&, const always_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const always_t&, const always_t&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const always_t&, const possibly_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const always_t&, const possibly_t<I>&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
+  friend constexpr bool operator==(
       const always_t&, const never_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const always_t&, const never_t<I>&)
   {
     return true;
@@ -893,15 +782,15 @@ struct always_t
   template <typename Executor>
   friend adapter<Executor> require(
       const Executor& e, const always_t&,
-      typename enable_if<
+      enable_if_t<
         is_executor<Executor>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_require<
           const Executor&,
           blocking_adaptation::allowed_t<0>
         >::is_valid
-      >::type* = 0)
+      >* = 0)
   {
     return adapter<Executor>(0, e);
   }
@@ -918,35 +807,15 @@ template <int I>
 struct never_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_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR never_t()
+  constexpr never_t()
   {
   }
 
@@ -963,58 +832,51 @@ struct never_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 E, typename T = decltype(never_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = never_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_t<I> value()
+  static constexpr blocking_t<I> value()
   {
     return never_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const never_t&, const never_t&)
+  friend constexpr bool operator==(const never_t&, const never_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const never_t&, const never_t&)
+  friend constexpr bool operator!=(const never_t&, const never_t&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const never_t&, const possibly_t<I>&)
+  friend constexpr bool operator==(const never_t&, const possibly_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const never_t&, const possibly_t<I>&)
+  friend constexpr bool operator!=(const never_t&, const possibly_t<I>&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const never_t&, const always_t<I>&)
+  friend constexpr bool operator==(const never_t&, const always_t<I>&)
   {
     return false;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const never_t&, const always_t<I>&)
+  friend constexpr bool operator!=(const never_t&, const always_t<I>&)
   {
     return true;
   }
@@ -1031,11 +893,7 @@ const T never_t<I>::static_query_v;
 
 typedef detail::blocking_t<> blocking_t;
 
-#if defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
 constexpr blocking_t blocking;
-#else // defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
-namespace { static const blocking_t& blocking = blocking_t::instance; }
-#endif
 
 } // namespace execution
 
@@ -1043,81 +901,25 @@ namespace { static const blocking_t& blocking = blocking_t::instance; }
 
 template <typename T>
 struct is_applicable_property<T, execution::blocking_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_t::possibly_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_t::always_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_t::never_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>
 {
 };
 
@@ -1129,42 +931,42 @@ namespace traits {
 
 template <typename T>
 struct query_free_default<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     can_query<T, execution::blocking_t::possibly_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::blocking_t::possibly_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::blocking_t::possibly_t>::value;
 
   typedef execution::blocking_t result_type;
 };
 
 template <typename T>
 struct query_free_default<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     !can_query<T, execution::blocking_t::possibly_t>::value
       && can_query<T, execution::blocking_t::always_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::blocking_t::always_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::blocking_t::always_t>::value;
 
   typedef execution::blocking_t result_type;
 };
 
 template <typename T>
 struct query_free_default<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     !can_query<T, execution::blocking_t::possibly_t>::value
       && !can_query<T, execution::blocking_t::always_t>::value
       && can_query<T, execution::blocking_t::never_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::blocking_t::never_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::blocking_t::never_t>::value;
 
   typedef execution::blocking_t result_type;
 };
@@ -1176,18 +978,18 @@ struct query_free_default<T, execution::blocking_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking_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_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::blocking_t::query_static_constexpr_member<T>::value();
   }
@@ -1195,21 +997,21 @@ struct static_query<T, execution::blocking_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_t<0>::
         query_member<T>::is_valid
       && traits::static_query<T, execution::blocking_t::possibly_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_t::possibly_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::blocking_t::possibly_t>::value();
   }
@@ -1217,22 +1019,22 @@ struct static_query<T, execution::blocking_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_t<0>::
         query_member<T>::is_valid
       && !traits::static_query<T, execution::blocking_t::possibly_t>::is_valid
       && traits::static_query<T, execution::blocking_t::always_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_t::always_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::blocking_t::always_t>::value();
   }
@@ -1240,7 +1042,7 @@ struct static_query<T, execution::blocking_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking_t<0>::
@@ -1248,15 +1050,15 @@ struct static_query<T, execution::blocking_t,
       && !traits::static_query<T, execution::blocking_t::possibly_t>::is_valid
       && !traits::static_query<T, execution::blocking_t::always_t>::is_valid
       && traits::static_query<T, execution::blocking_t::never_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_t::never_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::blocking_t::never_t>::value();
   }
@@ -1264,18 +1066,18 @@ struct static_query<T, execution::blocking_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t::possibly_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking::possibly_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::possibly_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::possibly_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1284,7 +1086,7 @@ struct static_query<T, execution::blocking_t::possibly_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t::possibly_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::blocking::possibly_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::blocking::possibly_t<0>::
@@ -1292,14 +1094,14 @@ struct static_query<T, execution::blocking_t::possibly_t,
       && !traits::query_free<T, execution::blocking_t::possibly_t>::is_valid
       && !can_query<T, execution::blocking_t::always_t>::value
       && !can_query<T, execution::blocking_t::never_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_t::possibly_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return result_type();
   }
@@ -1307,18 +1109,18 @@ struct static_query<T, execution::blocking_t::possibly_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t::always_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking::always_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::always_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::always_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1327,18 +1129,18 @@ struct static_query<T, execution::blocking_t::always_t,
 
 template <typename T>
 struct static_query<T, execution::blocking_t::never_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::blocking::never_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::never_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::never_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1348,61 +1150,21 @@ struct static_query<T, execution::blocking_t::never_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_t::possibly_t,
-  typename enable_if<
-    static_query<T, execution::blocking_t::possibly_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::blocking_t::possibly_t>::result_type,
-        execution::blocking_t::possibly_t>::value));
-};
-
-template <typename T>
-struct static_require<T, execution::blocking_t::always_t,
-  typename enable_if<
-    static_query<T, execution::blocking_t::always_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::blocking_t::always_t>::result_type,
-        execution::blocking_t::always_t>::value));
-};
-
-template <typename T>
-struct static_require<T, execution::blocking_t::never_t,
-  typename enable_if<
-    static_query<T, execution::blocking_t::never_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::blocking_t::never_t>::result_type,
-        execution::blocking_t::never_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_t::always_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
       && traits::static_require<
           const T&,
           execution::detail::blocking_adaptation::allowed_t<0>
         >::is_valid
-  >::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::adapter<T> result_type;
 };
 
@@ -1412,10 +1174,10 @@ struct require_free_default<T, execution::blocking_t::always_t,
 
 template <typename Executor>
 struct equality_comparable<
-  execution::detail::blocking::adapter<Executor> >
+  execution::detail::blocking::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)
@@ -1426,8 +1188,8 @@ template <typename Executor, typename Function>
 struct execute_member<
   execution::detail::blocking::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;
 };
 
@@ -1438,13 +1200,13 @@ struct execute_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking::adapter<Executor>,
-  execution::detail::blocking_t<I> >
+  execution::detail::blocking_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_t::always_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1453,13 +1215,13 @@ struct query_static_constexpr_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking::adapter<Executor>,
-  execution::detail::blocking::always_t<I> >
+  execution::detail::blocking::always_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_t::always_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1468,13 +1230,13 @@ struct query_static_constexpr_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking::adapter<Executor>,
-  execution::detail::blocking::possibly_t<I> >
+  execution::detail::blocking::possibly_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_t::always_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1483,13 +1245,13 @@ struct query_static_constexpr_member<
 template <typename Executor, int I>
 struct query_static_constexpr_member<
   execution::detail::blocking::adapter<Executor>,
-  execution::detail::blocking::never_t<I> >
+  execution::detail::blocking::never_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_t::always_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -1502,14 +1264,14 @@ struct query_static_constexpr_member<
 template <typename Executor, typename Property>
 struct query_member<
   execution::detail::blocking::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)
@@ -1520,53 +1282,52 @@ template <typename Executor, int I>
 struct require_member<
   execution::detail::blocking::adapter<Executor>,
   execution::detail::blocking::possibly_t<I>,
-  typename enable_if<
+  enable_if_t<
     can_require<
       const Executor&,
       execution::detail::blocking::possibly_t<I>
     >::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-      (is_nothrow_require<const Executor&,
-        execution::detail::blocking::possibly_t<I> >::value));
-  typedef typename require_result<const Executor&,
-    execution::detail::blocking::possibly_t<I> >::type result_type;
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_require<const Executor&,
+      execution::detail::blocking::possibly_t<I>>::value;
+  typedef require_result_t<const Executor&,
+    execution::detail::blocking::possibly_t<I>> result_type;
 };
 
 template <typename Executor, int I>
 struct require_member<
   execution::detail::blocking::adapter<Executor>,
   execution::detail::blocking::never_t<I>,
-  typename enable_if<
+  enable_if_t<
     can_require<
       const Executor&,
       execution::detail::blocking::never_t<I>
     >::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-      (is_nothrow_require<const Executor&,
-        execution::detail::blocking::never_t<I> >::value));
-  typedef typename require_result<const Executor&,
-    execution::detail::blocking::never_t<I> >::type result_type;
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_require<const Executor&,
+      execution::detail::blocking::never_t<I>>::value;
+  typedef require_result_t<const Executor&,
+    execution::detail::blocking::never_t<I>> result_type;
 };
 
 template <typename Executor, typename Property>
 struct require_member<
   execution::detail::blocking::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::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::adapter<
+    decay_t<require_result_t<Executor, Property>>> result_type;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_REQUIRE_MEMBER_TRAIT)
@@ -1576,16 +1337,15 @@ struct require_member<
 template <typename Executor, typename Property>
 struct prefer_member<
   execution::detail::blocking::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::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::adapter<
+    decay_t<prefer_result_t<Executor, Property>>> result_type;
 };
 
 #endif // !defined(BOOST_ASIO_HAS_DEDUCED_PREFER_MEMBER_TRAIT)