passenger 6.0.20 → 6.0.21

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

@@ -2,7 +2,7 @@
 // execution/mapping.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)
@@ -18,8 +18,6 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/type_traits.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/query.hpp>
 #include <boost/asio/traits/query_free.hpp>
@@ -41,10 +39,9 @@ namespace execution {
 /// of execution agents on to threads of execution.
 struct mapping_t
 {
-  /// The mapping_t property applies to executors, senders, and schedulers.
+  /// The mapping_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 mapping_t property cannot be required.
   static constexpr bool is_requirable = false;
@@ -59,11 +56,9 @@ struct mapping_t
   /// threads of execution.
   struct thread_t
   {
-    /// The mapping_t::thread_t property applies to executors, senders, and
-    /// schedulers.
+    /// The mapping_t::thread_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 mapping_t::thread_t property can be required.
     static constexpr bool is_requirable = true;
@@ -88,11 +83,9 @@ struct mapping_t
   /// new threads of execution.
   struct new_thread_t
   {
-    /// The mapping_t::new_thread_t property applies to executors, senders, and
-    /// schedulers.
+    /// The mapping_t::new_thread_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 mapping_t::new_thread_t property can be required.
     static constexpr bool is_requirable = true;
@@ -117,11 +110,9 @@ struct mapping_t
   /// implementation-defined.
   struct other_t
   {
-    /// The mapping_t::other_t property applies to executors, senders, and
-    /// schedulers.
+    /// The mapping_t::other_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 mapping_t::other_t property can be required.
     static constexpr bool is_requirable = true;
@@ -193,54 +184,34 @@ template <int I = 0>
 struct mapping_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 mapping_t polymorphic_query_result_type;
 
   typedef detail::mapping::thread_t<I> thread_t;
   typedef detail::mapping::new_thread_t<I> new_thread_t;
   typedef detail::mapping::other_t<I> other_t;
 
-  BOOST_ASIO_CONSTEXPR mapping_t()
+  constexpr mapping_t()
     : value_(-1)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR mapping_t(thread_t)
+  constexpr mapping_t(thread_t)
     : value_(0)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR mapping_t(new_thread_t)
+  constexpr mapping_t(new_thread_t)
     : value_(1)
   {
   }
 
-  BOOST_ASIO_CONSTEXPR mapping_t(other_t)
+  constexpr mapping_t(other_t)
     : value_(2)
   {
   }
@@ -252,16 +223,14 @@ struct mapping_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)
@@ -276,17 +245,17 @@ struct mapping_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)
@@ -306,88 +275,87 @@ struct mapping_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, thread_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, thread_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, thread_t>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, new_thread_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, thread_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, new_thread_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, new_thread_t>::value();
   }
 
   template <typename T>
-  static BOOST_ASIO_CONSTEXPR
+  static constexpr
   typename traits::static_query<T, other_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, thread_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !traits::static_query<T, new_thread_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         traits::static_query<T, other_t>::is_valid
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0) noexcept
   {
     return traits::static_query<T, other_t>::value();
   }
 
   template <typename E, typename T = decltype(mapping_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = mapping_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 mapping_t& a, const mapping_t& b)
   {
     return a.value_ == b.value_;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
+  friend constexpr bool operator!=(
       const mapping_t& a, const mapping_t& b)
   {
     return a.value_ != b.value_;
@@ -395,22 +363,20 @@ struct mapping_t
 
   struct convertible_from_mapping_t
   {
-    BOOST_ASIO_CONSTEXPR convertible_from_mapping_t(mapping_t) {}
+    constexpr convertible_from_mapping_t(mapping_t) {}
   };
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR mapping_t query(
+  friend constexpr mapping_t query(
       const Executor& ex, convertible_from_mapping_t,
-      typename enable_if<
+      enable_if_t<
         can_query<const Executor&, thread_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&, mapping_t<>::thread_t>::value))
+    noexcept(is_nothrow_query<const Executor&, mapping_t<>::thread_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, thread_t>::value))
+    noexcept(is_nothrow_query<const Executor&, thread_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -418,21 +384,20 @@ struct mapping_t
   }
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR mapping_t query(
+  friend constexpr mapping_t query(
       const Executor& ex, convertible_from_mapping_t,
-      typename enable_if<
+      enable_if_t<
         !can_query<const Executor&, thread_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         can_query<const Executor&, new_thread_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&, mapping_t<>::new_thread_t>::value))
+    noexcept(
+      is_nothrow_query<const Executor&, mapping_t<>::new_thread_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, new_thread_t>::value))
+    noexcept(is_nothrow_query<const Executor&, new_thread_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -440,24 +405,22 @@ struct mapping_t
   }
 
   template <typename Executor>
-  friend BOOST_ASIO_CONSTEXPR mapping_t query(
+  friend constexpr mapping_t query(
       const Executor& ex, convertible_from_mapping_t,
-      typename enable_if<
+      enable_if_t<
         !can_query<const Executor&, thread_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         !can_query<const Executor&, new_thread_t>::value
-      >::type* = 0,
-      typename enable_if<
+      >* = 0,
+      enable_if_t<
         can_query<const Executor&, other_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&, mapping_t<>::other_t>::value))
+    noexcept(is_nothrow_query<const Executor&, mapping_t<>::other_t>::value)
 #else // defined(BOOST_ASIO_MSVC)
-    BOOST_ASIO_NOEXCEPT_IF((
-      is_nothrow_query<const Executor&, other_t>::value))
+    noexcept(is_nothrow_query<const Executor&, other_t>::value)
 #endif // defined(BOOST_ASIO_MSVC)
 #endif // !defined(__clang__)
   {
@@ -468,10 +431,6 @@ struct mapping_t
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(new_thread_t, new_thread);
   BOOST_ASIO_STATIC_CONSTEXPR_DEFAULT_INIT(other_t, other);
 
-#if !defined(BOOST_ASIO_HAS_CONSTEXPR)
-  static const mapping_t instance;
-#endif // !defined(BOOST_ASIO_HAS_CONSTEXPR)
-
 private:
   int value_;
 };
@@ -483,11 +442,6 @@ const T mapping_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 mapping_t<I> mapping_t<I>::instance;
-#endif
-
 template <int I>
 const typename mapping_t<I>::thread_t mapping_t<I>::thread;
 
@@ -503,35 +457,15 @@ template <int I = 0>
 struct thread_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 mapping_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR thread_t()
+  constexpr thread_t()
   {
   }
 
@@ -548,58 +482,75 @@ struct thread_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 thread_t static_query(
-      typename enable_if<
+  static constexpr thread_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, thread_t>::is_valid
-      >::type* = 0,
-      typename enable_if<
-        !can_query<T, new_thread_t<I> >::value
-      >::type* = 0,
-      typename enable_if<
-        !can_query<T, other_t<I> >::value
-      >::type* = 0) BOOST_ASIO_NOEXCEPT
+      >* = 0,
+      enable_if_t<
+        !can_query<T, new_thread_t<I>>::value
+      >* = 0,
+      enable_if_t<
+        !can_query<T, other_t<I>>::value
+      >* = 0) noexcept
   {
     return thread_t();
   }
 
   template <typename E, typename T = decltype(thread_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
+  static constexpr const T static_query_v
     = thread_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR mapping_t<I> value()
+  static constexpr mapping_t<I> value()
   {
     return thread_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const thread_t&, const thread_t&)
+  friend constexpr bool operator==(const thread_t&, const thread_t&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const thread_t&, const thread_t&)
+  friend constexpr bool operator!=(const thread_t&, const thread_t&)
   {
     return false;
   }
+
+  friend constexpr bool operator==(const thread_t&, const new_thread_t<I>&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator!=(const thread_t&, const new_thread_t<I>&)
+  {
+    return true;
+  }
+
+  friend constexpr bool operator==(const thread_t&, const other_t<I>&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator!=(const thread_t&, const other_t<I>&)
+  {
+    return true;
+  }
 };
 
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
@@ -613,35 +564,15 @@ template <int I = 0>
 struct new_thread_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 mapping_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR new_thread_t()
+  constexpr new_thread_t()
   {
   }
 
@@ -658,37 +589,52 @@ struct new_thread_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(new_thread_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
-    = new_thread_t::static_query<E>();
+  static constexpr const T static_query_v = new_thread_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR mapping_t<I> value()
+  static constexpr mapping_t<I> value()
   {
     return new_thread_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const new_thread_t&, const new_thread_t&)
+  friend constexpr bool operator==(const new_thread_t&, const new_thread_t&)
+  {
+    return true;
+  }
+
+  friend constexpr bool operator!=(const new_thread_t&, const new_thread_t&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator==(const new_thread_t&, const thread_t<I>&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator!=(const new_thread_t&, const thread_t<I>&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const new_thread_t&, const new_thread_t&)
+  friend constexpr bool operator==(const new_thread_t&, const other_t<I>&)
   {
     return false;
   }
+
+  friend constexpr bool operator!=(const new_thread_t&, const other_t<I>&)
+  {
+    return true;
+  }
 };
 
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
@@ -702,35 +648,15 @@ template <int I>
 struct other_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 mapping_t<I> polymorphic_query_result_type;
 
-  BOOST_ASIO_CONSTEXPR other_t()
+  constexpr other_t()
   {
   }
 
@@ -747,37 +673,53 @@ struct other_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(other_t::static_query<E>())>
-  static BOOST_ASIO_CONSTEXPR const T static_query_v
-    = other_t::static_query<E>();
+  static constexpr const T static_query_v = other_t::static_query<E>();
 #endif // defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT)
        //   && defined(BOOST_ASIO_HAS_SFINAE_VARIABLE_TEMPLATES)
 
-  static BOOST_ASIO_CONSTEXPR mapping_t<I> value()
+  static constexpr mapping_t<I> value()
   {
     return other_t();
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator==(
-      const other_t&, const other_t&)
+  friend constexpr bool operator==(const other_t&, const other_t&)
+  {
+    return true;
+  }
+
+  friend constexpr bool operator!=(const other_t&, const other_t&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator==(const other_t&, const thread_t<I>&)
+  {
+    return false;
+  }
+
+  friend constexpr bool operator!=(const other_t&, const thread_t<I>&)
   {
     return true;
   }
 
-  friend BOOST_ASIO_CONSTEXPR bool operator!=(
-      const other_t&, const other_t&)
+  friend constexpr bool operator==(const other_t&, const new_thread_t<I>&)
   {
     return false;
   }
+
+  friend constexpr bool operator!=(const other_t&, const new_thread_t<I>&)
+  {
+    return true;
+  }
 };
 
 #if defined(BOOST_ASIO_HAS_DEDUCED_STATIC_QUERY_TRAIT) \
@@ -792,11 +734,7 @@ const T other_t<I>::static_query_v;
 
 typedef detail::mapping_t<> mapping_t;
 
-#if defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
 constexpr mapping_t mapping;
-#else // defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
-namespace { static const mapping_t& mapping = mapping_t::instance; }
-#endif
 
 } // namespace execution
 
@@ -804,81 +742,25 @@ namespace { static const mapping_t& mapping = mapping_t::instance; }
 
 template <typename T>
 struct is_applicable_property<T, execution::mapping_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::mapping_t::thread_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::mapping_t::new_thread_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::mapping_t::other_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>
 {
 };
 
@@ -890,42 +772,42 @@ namespace traits {
 
 template <typename T>
 struct query_free_default<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     can_query<T, execution::mapping_t::thread_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::mapping_t::thread_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::mapping_t::thread_t>::value;
 
   typedef execution::mapping_t result_type;
 };
 
 template <typename T>
 struct query_free_default<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     !can_query<T, execution::mapping_t::thread_t>::value
       && can_query<T, execution::mapping_t::new_thread_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::mapping_t::new_thread_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::mapping_t::new_thread_t>::value;
 
   typedef execution::mapping_t result_type;
 };
 
 template <typename T>
 struct query_free_default<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     !can_query<T, execution::mapping_t::thread_t>::value
       && !can_query<T, execution::mapping_t::new_thread_t>::value
       && can_query<T, execution::mapping_t::other_t>::value
-  >::type>
+  >>
 {
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid = true);
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_noexcept =
-    (is_nothrow_query<T, execution::mapping_t::other_t>::value));
+  static constexpr bool is_valid = true;
+  static constexpr bool is_noexcept =
+    is_nothrow_query<T, execution::mapping_t::other_t>::value;
 
   typedef execution::mapping_t result_type;
 };
@@ -937,18 +819,18 @@ struct query_free_default<T, execution::mapping_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::mapping_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::mapping_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::mapping_t<0>::
       query_static_constexpr_member<T>::value();
@@ -957,21 +839,21 @@ struct static_query<T, execution::mapping_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::mapping_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::mapping_t<0>::
         query_member<T>::is_valid
       && traits::static_query<T, execution::mapping_t::thread_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::mapping_t::thread_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::mapping_t::thread_t>::value();
   }
@@ -979,22 +861,22 @@ struct static_query<T, execution::mapping_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::mapping_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::mapping_t<0>::
         query_member<T>::is_valid
       && !traits::static_query<T, execution::mapping_t::thread_t>::is_valid
       && traits::static_query<T, execution::mapping_t::new_thread_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::mapping_t::new_thread_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::mapping_t::new_thread_t>::value();
   }
@@ -1002,7 +884,7 @@ struct static_query<T, execution::mapping_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::mapping_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::mapping_t<0>::
@@ -1010,15 +892,15 @@ struct static_query<T, execution::mapping_t,
       && !traits::static_query<T, execution::mapping_t::thread_t>::is_valid
       && !traits::static_query<T, execution::mapping_t::new_thread_t>::is_valid
       && traits::static_query<T, execution::mapping_t::other_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::mapping_t::other_t>::result_type result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return traits::static_query<T, execution::mapping_t::other_t>::value();
   }
@@ -1026,18 +908,18 @@ struct static_query<T, execution::mapping_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t::thread_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::mapping::thread_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::mapping::thread_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::mapping::thread_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1046,7 +928,7 @@ struct static_query<T, execution::mapping_t::thread_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t::thread_t,
-  typename enable_if<
+  enable_if_t<
     !execution::detail::mapping::thread_t<0>::
         query_static_constexpr_member<T>::is_valid
       && !execution::detail::mapping::thread_t<0>::
@@ -1054,14 +936,14 @@ struct static_query<T, execution::mapping_t::thread_t,
       && !traits::query_free<T, execution::mapping_t::thread_t>::is_valid
       && !can_query<T, execution::mapping_t::new_thread_t>::value
       && !can_query<T, execution::mapping_t::other_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::mapping_t::thread_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value()
+  static constexpr result_type value()
   {
     return result_type();
   }
@@ -1069,18 +951,18 @@ struct static_query<T, execution::mapping_t::thread_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t::new_thread_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::mapping::new_thread_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::mapping::new_thread_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::mapping::new_thread_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1089,18 +971,18 @@ struct static_query<T, execution::mapping_t::new_thread_t,
 
 template <typename T>
 struct static_query<T, execution::mapping_t::other_t,
-  typename enable_if<
+  enable_if_t<
     execution::detail::mapping::other_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::mapping::other_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::mapping::other_t<0>::
       query_static_constexpr_member<T>::value();
@@ -1110,46 +992,6 @@ struct static_query<T, execution::mapping_t::other_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::mapping_t::thread_t,
-  typename enable_if<
-    static_query<T, execution::mapping_t::thread_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::mapping_t::thread_t>::result_type,
-        execution::mapping_t::thread_t>::value));
-};
-
-template <typename T>
-struct static_require<T, execution::mapping_t::new_thread_t,
-  typename enable_if<
-    static_query<T, execution::mapping_t::new_thread_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::mapping_t::new_thread_t>::result_type,
-        execution::mapping_t::new_thread_t>::value));
-};
-
-template <typename T>
-struct static_require<T, execution::mapping_t::other_t,
-  typename enable_if<
-    static_query<T, execution::mapping_t::other_t>::is_valid
-  >::type>
-{
-  BOOST_ASIO_STATIC_CONSTEXPR(bool, is_valid =
-    (is_same<typename static_query<T,
-      execution::mapping_t::other_t>::result_type,
-        execution::mapping_t::other_t>::value));
-};
-
-#endif // !defined(BOOST_ASIO_HAS_DEDUCED_STATIC_REQUIRE_TRAIT)
-
 } // namespace traits
 
 #endif // defined(GENERATING_DOCUMENTATION)