passenger 6.0.20 → 6.0.21

data/src/cxx_supportlib/vendor-modified/boost/asio/system_executor.hpp

@@ -2,7 +2,7 @@
 // system_executor.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)
@@ -40,7 +40,7 @@ class basic_system_executor
 {
 public:
   /// Default constructor.
-  basic_system_executor() BOOST_ASIO_NOEXCEPT
+  basic_system_executor() noexcept
     : allocator_(Allocator())
   {
   }
@@ -169,11 +169,11 @@ private:
    * auto ex2 = boost::asio::require(ex1,
    *     boost::asio::execution::allocator); @endcode
    */
-  basic_system_executor<Blocking, Relationship, std::allocator<void> >
+  basic_system_executor<Blocking, Relationship, std::allocator<void>>
   require(execution::allocator_t<void>) const
   {
     return basic_system_executor<Blocking,
-        Relationship, std::allocator<void> >();
+        Relationship, std::allocator<void>>();
   }
 
 #if !defined(GENERATING_DOCUMENTATION)
@@ -196,8 +196,8 @@ private:
    *       == boost::asio::execution::mapping.thread)
    *   ... @endcode
    */
-  static BOOST_ASIO_CONSTEXPR execution::mapping_t query(
-      execution::mapping_t) BOOST_ASIO_NOEXCEPT
+  static constexpr execution::mapping_t query(
+      execution::mapping_t) noexcept
   {
     return execution::mapping.thread;
   }
@@ -212,7 +212,7 @@ private:
    * boost::asio::system_context& pool = boost::asio::query(
    *     ex, boost::asio::execution::context); @endcode
    */
-  static system_context& query(execution::context_t) BOOST_ASIO_NOEXCEPT;
+  static system_context& query(execution::context_t) noexcept;
 
   /// Query the current value of the @c blocking property.
   /**
@@ -225,8 +225,8 @@ private:
    *       == boost::asio::execution::blocking.always)
    *   ... @endcode
    */
-  static BOOST_ASIO_CONSTEXPR execution::blocking_t query(
-      execution::blocking_t) BOOST_ASIO_NOEXCEPT
+  static constexpr execution::blocking_t query(
+      execution::blocking_t) noexcept
   {
     return Blocking();
   }
@@ -242,8 +242,8 @@ private:
    *       == boost::asio::execution::relationship.continuation)
    *   ... @endcode
    */
-  static BOOST_ASIO_CONSTEXPR execution::relationship_t query(
-      execution::relationship_t) BOOST_ASIO_NOEXCEPT
+  static constexpr execution::relationship_t query(
+      execution::relationship_t) noexcept
   {
     return Relationship();
   }
@@ -259,8 +259,8 @@ private:
    *     boost::asio::execution::allocator); @endcode
    */
   template <typename OtherAllocator>
-  BOOST_ASIO_CONSTEXPR Allocator query(
-      execution::allocator_t<OtherAllocator>) const BOOST_ASIO_NOEXCEPT
+  constexpr Allocator query(
+      execution::allocator_t<OtherAllocator>) const noexcept
   {
     return allocator_;
   }
@@ -275,8 +275,8 @@ private:
    * auto alloc = boost::asio::query(ex,
    *     boost::asio::execution::allocator); @endcode
    */
-  BOOST_ASIO_CONSTEXPR Allocator query(
-      execution::allocator_t<void>) const BOOST_ASIO_NOEXCEPT
+  constexpr Allocator query(
+      execution::allocator_t<void>) const noexcept
   {
     return allocator_;
   }
@@ -292,7 +292,7 @@ private:
    * std::size_t occupancy = boost::asio::query(
    *     ex, boost::asio::execution::occupancy); @endcode
    */
-  std::size_t query(execution::occupancy_t) const BOOST_ASIO_NOEXCEPT;
+  std::size_t query(execution::occupancy_t) const noexcept;
 
 public:
   /// Compare two executors for equality.
@@ -300,7 +300,7 @@ public:
    * Two executors are equal if they refer to the same underlying io_context.
    */
   friend bool operator==(const basic_system_executor&,
-      const basic_system_executor&) BOOST_ASIO_NOEXCEPT
+      const basic_system_executor&) noexcept
   {
     return true;
   }
@@ -310,28 +310,28 @@ public:
    * Two executors are equal if they refer to the same underlying io_context.
    */
   friend bool operator!=(const basic_system_executor&,
-      const basic_system_executor&) BOOST_ASIO_NOEXCEPT
+      const basic_system_executor&) noexcept
   {
     return false;
   }
 
   /// Execution function.
   template <typename Function>
-  void execute(BOOST_ASIO_MOVE_ARG(Function) f) const
+  void execute(Function&& f) const
   {
-    this->do_execute(BOOST_ASIO_MOVE_CAST(Function)(f), Blocking());
+    this->do_execute(static_cast<Function&&>(f), Blocking());
   }
 
 #if !defined(BOOST_ASIO_NO_TS_EXECUTORS)
 public:
   /// Obtain the underlying execution context.
-  system_context& context() const BOOST_ASIO_NOEXCEPT;
+  system_context& context() const noexcept;
 
   /// Inform the executor that it has some outstanding work to do.
   /**
    * For the system executor, this is a no-op.
    */
-  void on_work_started() const BOOST_ASIO_NOEXCEPT
+  void on_work_started() const noexcept
   {
   }
 
@@ -339,7 +339,7 @@ public:
   /**
    * For the system executor, this is a no-op.
    */
-  void on_work_finished() const BOOST_ASIO_NOEXCEPT
+  void on_work_finished() const noexcept
   {
   }
 
@@ -356,7 +356,7 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename OtherAllocator>
-  void dispatch(BOOST_ASIO_MOVE_ARG(Function) f, const OtherAllocator& a) const;
+  void dispatch(Function&& f, const OtherAllocator& a) const;
 
   /// Request the system executor to invoke the given function object.
   /**
@@ -372,7 +372,7 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename OtherAllocator>
-  void post(BOOST_ASIO_MOVE_ARG(Function) f, const OtherAllocator& a) const;
+  void post(Function&& f, const OtherAllocator& a) const;
 
   /// Request the system executor to invoke the given function object.
   /**
@@ -388,7 +388,7 @@ public:
    * internal storage needed for function invocation.
    */
   template <typename Function, typename OtherAllocator>
-  void defer(BOOST_ASIO_MOVE_ARG(Function) f, const OtherAllocator& a) const;
+  void defer(Function&& f, const OtherAllocator& a) const;
 #endif // !defined(BOOST_ASIO_NO_TS_EXECUTORS)
 
 private:
@@ -402,17 +402,17 @@ private:
 
   /// Execution helper implementation for the possibly blocking property.
   template <typename Function>
-  void do_execute(BOOST_ASIO_MOVE_ARG(Function) f,
+  void do_execute(Function&& f,
       execution::blocking_t::possibly_t) const;
 
   /// Execution helper implementation for the always blocking property.
   template <typename Function>
-  void do_execute(BOOST_ASIO_MOVE_ARG(Function) f,
+  void do_execute(Function&& f,
       execution::blocking_t::always_t) const;
 
   /// Execution helper implementation for the never blocking property.
   template <typename Function>
-  void do_execute(BOOST_ASIO_MOVE_ARG(Function) f,
+  void do_execute(Function&& f,
       execution::blocking_t::never_t) const;
 
   // The allocator used for execution functions.
@@ -429,7 +429,7 @@ private:
  * immediately.
  */
 typedef basic_system_executor<execution::blocking_t::possibly_t,
-    execution::relationship_t::fork_t, std::allocator<void> >
+    execution::relationship_t::fork_t, std::allocator<void>>
   system_executor;
 
 #if !defined(GENERATING_DOCUMENTATION)
@@ -443,8 +443,8 @@ struct equality_comparable<
     boost::asio::basic_system_executor<Blocking, Relationship, Allocator>
   >
 {
-  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)
@@ -458,8 +458,8 @@ struct execute_member<
     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;
 };
 
@@ -473,8 +473,8 @@ struct require_member<
     boost::asio::execution::blocking_t::possibly_t
   >
 {
-  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 boost::asio::basic_system_executor<
       boost::asio::execution::blocking_t::possibly_t,
       Relationship, Allocator> result_type;
@@ -486,8 +486,8 @@ struct require_member<
     boost::asio::execution::blocking_t::always_t
   >
 {
-  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 boost::asio::basic_system_executor<
       boost::asio::execution::blocking_t::always_t,
       Relationship, Allocator> result_type;
@@ -499,8 +499,8 @@ struct require_member<
     boost::asio::execution::blocking_t::never_t
   >
 {
-  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 boost::asio::basic_system_executor<
       boost::asio::execution::blocking_t::never_t,
       Relationship, Allocator> result_type;
@@ -512,8 +512,8 @@ struct require_member<
     boost::asio::execution::relationship_t::fork_t
   >
 {
-  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 boost::asio::basic_system_executor<Blocking,
       boost::asio::execution::relationship_t::fork_t,
       Allocator> result_type;
@@ -525,8 +525,8 @@ struct require_member<
     boost::asio::execution::relationship_t::continuation_t
   >
 {
-  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 boost::asio::basic_system_executor<Blocking,
       boost::asio::execution::relationship_t::continuation_t,
       Allocator> result_type;
@@ -538,10 +538,10 @@ struct require_member<
     boost::asio::execution::allocator_t<void>
   >
 {
-  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 boost::asio::basic_system_executor<Blocking,
-      Relationship, std::allocator<void> > result_type;
+      Relationship, std::allocator<void>> result_type;
 };
 
 template <typename Blocking, typename Relationship,
@@ -551,8 +551,8 @@ struct require_member<
     boost::asio::execution::allocator_t<OtherAllocator>
   >
 {
-  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 boost::asio::basic_system_executor<Blocking,
       Relationship, OtherAllocator> result_type;
 };
@@ -574,11 +574,11 @@ struct query_static_constexpr_member<
     >::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 boost::asio::execution::mapping_t::thread_t result_type;
 
-  static BOOST_ASIO_CONSTEXPR result_type value() BOOST_ASIO_NOEXCEPT
+  static constexpr result_type value() noexcept
   {
     return result_type();
   }
@@ -601,8 +601,8 @@ struct query_member<
     >::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 boost::asio::execution::blocking_t result_type;
 };
 
@@ -619,8 +619,8 @@ struct query_member<
     >::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 boost::asio::execution::relationship_t result_type;
 };
 
@@ -630,8 +630,8 @@ struct query_member<
     boost::asio::execution::context_t
   >
 {
-  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 boost::asio::system_context& result_type;
 };
 
@@ -641,8 +641,8 @@ struct query_member<
     boost::asio::execution::allocator_t<void>
   >
 {
-  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 Allocator result_type;
 };
 
@@ -652,8 +652,8 @@ struct query_member<
     boost::asio::execution::allocator_t<Allocator>
   >
 {
-  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 Allocator result_type;
 };
 

data/src/cxx_supportlib/vendor-modified/boost/asio/system_timer.hpp

@@ -2,7 +2,7 @@
 // system_timer.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)
@@ -16,9 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-
-#if defined(BOOST_ASIO_HAS_CHRONO) || defined(GENERATING_DOCUMENTATION)
-
 #include <boost/asio/basic_waitable_timer.hpp>
 #include <boost/asio/detail/chrono.hpp>
 
@@ -39,6 +36,4 @@ typedef basic_waitable_timer<chrono::system_clock> system_timer;
 } // namespace asio
 } // namespace boost
 
-#endif // defined(BOOST_ASIO_HAS_CHRONO) || defined(GENERATING_DOCUMENTATION)
-
 #endif // BOOST_ASIO_SYSTEM_TIMER_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/this_coro.hpp

@@ -2,7 +2,7 @@
 // this_coro.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)
@@ -27,22 +27,18 @@ namespace this_coro {
 /// Awaitable type that returns the executor of the current coroutine.
 struct executor_t
 {
-  BOOST_ASIO_CONSTEXPR executor_t()
+  constexpr executor_t()
   {
   }
 };
 
 /// Awaitable object that returns the executor of the current coroutine.
-#if defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
 constexpr executor_t executor;
-#elif defined(BOOST_ASIO_MSVC)
-__declspec(selectany) executor_t executor;
-#endif
 
 /// Awaitable type that returns the cancellation state of the current coroutine.
 struct cancellation_state_t
 {
-  BOOST_ASIO_CONSTEXPR cancellation_state_t()
+  constexpr cancellation_state_t()
   {
   }
 };
@@ -62,11 +58,7 @@ struct cancellation_state_t
  *     // ...
  * } @endcode
  */
-#if defined(BOOST_ASIO_HAS_CONSTEXPR) || defined(GENERATING_DOCUMENTATION)
 constexpr cancellation_state_t cancellation_state;
-#elif defined(BOOST_ASIO_MSVC)
-__declspec(selectany) cancellation_state_t cancellation_state;
-#endif
 
 #if defined(GENERATING_DOCUMENTATION)
 
@@ -89,7 +81,7 @@ __declspec(selectany) cancellation_state_t cancellation_state;
  * @note The cancellation state is shared by all coroutines in the same "thread
  * of execution" that was created using boost::asio::co_spawn.
  */
-BOOST_ASIO_NODISCARD BOOST_ASIO_CONSTEXPR unspecified
+BOOST_ASIO_NODISCARD constexpr unspecified
 reset_cancellation_state();
 
 /// Returns an awaitable object that may be used to reset the cancellation state
@@ -114,8 +106,8 @@ reset_cancellation_state();
  * of execution" that was created using boost::asio::co_spawn.
  */
 template <typename Filter>
-BOOST_ASIO_NODISCARD BOOST_ASIO_CONSTEXPR unspecified
-reset_cancellation_state(BOOST_ASIO_MOVE_ARG(Filter) filter);
+BOOST_ASIO_NODISCARD constexpr unspecified
+reset_cancellation_state(Filter&& filter);
 
 /// Returns an awaitable object that may be used to reset the cancellation state
 /// of the current coroutine.
@@ -141,10 +133,10 @@ reset_cancellation_state(BOOST_ASIO_MOVE_ARG(Filter) filter);
  * of execution" that was created using boost::asio::co_spawn.
  */
 template <typename InFilter, typename OutFilter>
-BOOST_ASIO_NODISCARD BOOST_ASIO_CONSTEXPR unspecified
+BOOST_ASIO_NODISCARD constexpr unspecified
 reset_cancellation_state(
-    BOOST_ASIO_MOVE_ARG(InFilter) in_filter,
-    BOOST_ASIO_MOVE_ARG(OutFilter) out_filter);
+    InFilter&& in_filter,
+    OutFilter&& out_filter);
 
 /// Returns an awaitable object that may be used to determine whether the
 /// coroutine throws if trying to suspend when it has been cancelled.
@@ -158,7 +150,7 @@ reset_cancellation_state(
  *   // ...
  * } @endcode
  */
-BOOST_ASIO_NODISCARD BOOST_ASIO_CONSTEXPR unspecified
+BOOST_ASIO_NODISCARD constexpr unspecified
 throw_if_cancelled();
 
 /// Returns an awaitable object that may be used to specify whether the
@@ -172,19 +164,19 @@ throw_if_cancelled();
  *   // ...
  * } @endcode
  */
-BOOST_ASIO_NODISCARD BOOST_ASIO_CONSTEXPR unspecified
+BOOST_ASIO_NODISCARD constexpr unspecified
 throw_if_cancelled(bool value);
 
 #else // defined(GENERATING_DOCUMENTATION)
 
 struct reset_cancellation_state_0_t
 {
-  BOOST_ASIO_CONSTEXPR reset_cancellation_state_0_t()
+  constexpr reset_cancellation_state_0_t()
   {
   }
 };
 
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR reset_cancellation_state_0_t
+BOOST_ASIO_NODISCARD inline constexpr reset_cancellation_state_0_t
 reset_cancellation_state()
 {
   return reset_cancellation_state_0_t();
@@ -194,9 +186,9 @@ template <typename Filter>
 struct reset_cancellation_state_1_t
 {
   template <typename F>
-  explicit BOOST_ASIO_CONSTEXPR reset_cancellation_state_1_t(
-      BOOST_ASIO_MOVE_ARG(F) filt)
-    : filter(BOOST_ASIO_MOVE_CAST(F)(filt))
+  explicit constexpr reset_cancellation_state_1_t(
+      F&& filt)
+    : filter(static_cast<F&&>(filt))
   {
   }
 
@@ -204,22 +196,22 @@ struct reset_cancellation_state_1_t
 };
 
 template <typename Filter>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR reset_cancellation_state_1_t<
-    typename decay<Filter>::type>
-reset_cancellation_state(BOOST_ASIO_MOVE_ARG(Filter) filter)
+BOOST_ASIO_NODISCARD inline constexpr reset_cancellation_state_1_t<
+    decay_t<Filter>>
+reset_cancellation_state(Filter&& filter)
 {
-  return reset_cancellation_state_1_t<typename decay<Filter>::type>(
-      BOOST_ASIO_MOVE_CAST(Filter)(filter));
+  return reset_cancellation_state_1_t<decay_t<Filter>>(
+      static_cast<Filter&&>(filter));
 }
 
 template <typename InFilter, typename OutFilter>
 struct reset_cancellation_state_2_t
 {
   template <typename F1, typename F2>
-  BOOST_ASIO_CONSTEXPR reset_cancellation_state_2_t(
-      BOOST_ASIO_MOVE_ARG(F1) in_filt, BOOST_ASIO_MOVE_ARG(F2) out_filt)
-    : in_filter(BOOST_ASIO_MOVE_CAST(F1)(in_filt)),
-      out_filter(BOOST_ASIO_MOVE_CAST(F2)(out_filt))
+  constexpr reset_cancellation_state_2_t(
+      F1&& in_filt, F2&& out_filt)
+    : in_filter(static_cast<F1&&>(in_filt)),
+      out_filter(static_cast<F2&&>(out_filt))
   {
   }
 
@@ -228,28 +220,23 @@ struct reset_cancellation_state_2_t
 };
 
 template <typename InFilter, typename OutFilter>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR reset_cancellation_state_2_t<
-    typename decay<InFilter>::type,
-    typename decay<OutFilter>::type>
-reset_cancellation_state(
-    BOOST_ASIO_MOVE_ARG(InFilter) in_filter,
-    BOOST_ASIO_MOVE_ARG(OutFilter) out_filter)
+BOOST_ASIO_NODISCARD inline constexpr
+reset_cancellation_state_2_t<decay_t<InFilter>, decay_t<OutFilter>>
+reset_cancellation_state(InFilter&& in_filter, OutFilter&& out_filter)
 {
-  return reset_cancellation_state_2_t<
-      typename decay<InFilter>::type,
-      typename decay<OutFilter>::type>(
-        BOOST_ASIO_MOVE_CAST(InFilter)(in_filter),
-        BOOST_ASIO_MOVE_CAST(OutFilter)(out_filter));
+  return reset_cancellation_state_2_t<decay_t<InFilter>, decay_t<OutFilter>>(
+      static_cast<InFilter&&>(in_filter),
+      static_cast<OutFilter&&>(out_filter));
 }
 
 struct throw_if_cancelled_0_t
 {
-  BOOST_ASIO_CONSTEXPR throw_if_cancelled_0_t()
+  constexpr throw_if_cancelled_0_t()
   {
   }
 };
 
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR throw_if_cancelled_0_t
+BOOST_ASIO_NODISCARD inline constexpr throw_if_cancelled_0_t
 throw_if_cancelled()
 {
   return throw_if_cancelled_0_t();
@@ -257,7 +244,7 @@ throw_if_cancelled()
 
 struct throw_if_cancelled_1_t
 {
-  explicit BOOST_ASIO_CONSTEXPR throw_if_cancelled_1_t(bool val)
+  explicit constexpr throw_if_cancelled_1_t(bool val)
     : value(val)
   {
   }
@@ -265,7 +252,7 @@ struct throw_if_cancelled_1_t
   bool value;
 };
 
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR throw_if_cancelled_1_t
+BOOST_ASIO_NODISCARD inline constexpr throw_if_cancelled_1_t
 throw_if_cancelled(bool value)
 {
   return throw_if_cancelled_1_t(value);