passenger 6.0.20 → 6.0.21

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

@@ -2,7 +2,7 @@
 // any_completion_handler.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)
@@ -12,12 +12,6 @@
 #define BOOST_ASIO_ANY_COMPLETION_HANDLER_HPP
 
 #include <boost/asio/detail/config.hpp>
-
-#if (defined(BOOST_ASIO_HAS_STD_TUPLE) \
-    && defined(BOOST_ASIO_HAS_MOVE) \
-    && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)) \
-  || defined(GENERATING_DOCUMENTATION)
-
 #include <cstring>
 #include <functional>
 #include <memory>
@@ -42,11 +36,11 @@ class any_completion_handler_impl_base
 public:
   template <typename S>
   explicit any_completion_handler_impl_base(S&& slot)
-    : cancel_state_(BOOST_ASIO_MOVE_CAST(S)(slot), enable_total_cancellation())
+    : cancel_state_(static_cast<S&&>(slot), enable_total_cancellation())
   {
   }
 
-  cancellation_slot get_cancellation_slot() const BOOST_ASIO_NOEXCEPT
+  cancellation_slot get_cancellation_slot() const noexcept
   {
     return cancel_state_.slot();
   }
@@ -62,8 +56,8 @@ class any_completion_handler_impl :
 public:
   template <typename S, typename H>
   any_completion_handler_impl(S&& slot, H&& h)
-    : any_completion_handler_impl_base(BOOST_ASIO_MOVE_CAST(S)(slot)),
-      handler_(BOOST_ASIO_MOVE_CAST(H)(h))
+    : any_completion_handler_impl_base(static_cast<S&&>(slot)),
+      handler_(static_cast<H&&>(h))
   {
   }
 
@@ -106,7 +100,7 @@ public:
 
     any_completion_handler_impl* ptr =
       new (uninit_ptr.get()) any_completion_handler_impl(
-        BOOST_ASIO_MOVE_CAST(S)(slot), BOOST_ASIO_MOVE_CAST(H)(h));
+        static_cast<S&&>(slot), static_cast<H&&>(h));
 
     uninit_ptr.release();
     return ptr;
@@ -122,14 +116,14 @@ public:
   }
 
   any_completion_executor executor(
-      const any_completion_executor& candidate) const BOOST_ASIO_NOEXCEPT
+      const any_completion_executor& candidate) const noexcept
   {
     return any_completion_executor(std::nothrow,
         (get_associated_executor)(handler_, candidate));
   }
 
   any_completion_executor immediate_executor(
-      const any_io_executor& candidate) const BOOST_ASIO_NOEXCEPT
+      const any_io_executor& candidate) const noexcept
   {
     return any_completion_executor(std::nothrow,
         (get_associated_immediate_executor)(handler_, candidate));
@@ -190,11 +184,11 @@ public:
           boost::asio::recycling_allocator<void>())};
 
     std::unique_ptr<any_completion_handler_impl, deleter> ptr(this, d);
-    Handler handler(BOOST_ASIO_MOVE_CAST(Handler)(handler_));
+    Handler handler(static_cast<Handler&&>(handler_));
     ptr.reset();
 
-    BOOST_ASIO_MOVE_CAST(Handler)(handler)(
-        BOOST_ASIO_MOVE_CAST(Args)(args)...);
+    static_cast<Handler&&>(handler)(
+        static_cast<Args&&>(args)...);
   }
 
 private:
@@ -217,14 +211,14 @@ public:
 
   void call(any_completion_handler_impl_base* impl, Args... args) const
   {
-    call_fn_(impl, BOOST_ASIO_MOVE_CAST(Args)(args)...);
+    call_fn_(impl, static_cast<Args&&>(args)...);
   }
 
   template <typename Handler>
   static void impl(any_completion_handler_impl_base* impl, Args... args)
   {
     static_cast<any_completion_handler_impl<Handler>*>(impl)->call(
-        BOOST_ASIO_MOVE_CAST(Args)(args)...);
+        static_cast<Args&&>(args)...);
   }
 
 private:
@@ -476,7 +470,7 @@ private:
   detail::any_completion_handler_impl_base* impl_;
 
   constexpr any_completion_handler_allocator(int,
-      const any_completion_handler<Signatures...>& h) BOOST_ASIO_NOEXCEPT
+      const any_completion_handler<Signatures...>& h) noexcept
     : fn_table_(h.fn_table_),
       impl_(h.impl_)
   {
@@ -498,7 +492,7 @@ public:
   template <typename U>
   constexpr any_completion_handler_allocator(
       const any_completion_handler_allocator<U, Signatures...>& a)
-    BOOST_ASIO_NOEXCEPT
+    noexcept
     : fn_table_(a.fn_table_),
       impl_(a.impl_)
   {
@@ -506,14 +500,14 @@ public:
 
   /// Equality operator.
   constexpr bool operator==(
-      const any_completion_handler_allocator& other) const BOOST_ASIO_NOEXCEPT
+      const any_completion_handler_allocator& other) const noexcept
   {
     return fn_table_ == other.fn_table_ && impl_ == other.impl_;
   }
 
   /// Inequality operator.
   constexpr bool operator!=(
-      const any_completion_handler_allocator& other) const BOOST_ASIO_NOEXCEPT
+      const any_completion_handler_allocator& other) const noexcept
   {
     return fn_table_ != other.fn_table_ || impl_ != other.impl_;
   }
@@ -521,9 +515,15 @@ public:
   /// Allocate space for @c n objects of the allocator's value type.
   T* allocate(std::size_t n) const
   {
-    return static_cast<T*>(
-        fn_table_->allocate(
-          impl_, sizeof(T) * n, alignof(T)));
+    if (fn_table_)
+    {
+      return static_cast<T*>(
+          fn_table_->allocate(
+            impl_, sizeof(T) * n, alignof(T)));
+    }
+    std::bad_alloc ex;
+    boost::asio::detail::throw_exception(ex);
+    return nullptr;
   }
 
   /// Deallocate space for @c n objects of the allocator's value type.
@@ -550,7 +550,7 @@ private:
   detail::any_completion_handler_impl_base* impl_;
 
   constexpr any_completion_handler_allocator(int,
-      const any_completion_handler<Signatures...>& h) BOOST_ASIO_NOEXCEPT
+      const any_completion_handler<Signatures...>& h) noexcept
     : fn_table_(h.fn_table_),
       impl_(h.impl_)
   {
@@ -572,7 +572,7 @@ public:
   template <typename U>
   constexpr any_completion_handler_allocator(
       const any_completion_handler_allocator<U, Signatures...>& a)
-    BOOST_ASIO_NOEXCEPT
+    noexcept
     : fn_table_(a.fn_table_),
       impl_(a.impl_)
   {
@@ -580,14 +580,14 @@ public:
 
   /// Equality operator.
   constexpr bool operator==(
-      const any_completion_handler_allocator& other) const BOOST_ASIO_NOEXCEPT
+      const any_completion_handler_allocator& other) const noexcept
   {
     return fn_table_ == other.fn_table_ && impl_ == other.impl_;
   }
 
   /// Inequality operator.
   constexpr bool operator!=(
-      const any_completion_handler_allocator& other) const BOOST_ASIO_NOEXCEPT
+      const any_completion_handler_allocator& other) const noexcept
   {
     return fn_table_ != other.fn_table_ || impl_ != other.impl_;
   }
@@ -652,16 +652,16 @@ public:
   }
 
   /// Construct an @c any_completion_handler to contain the specified target.
-  template <typename H, typename Handler = typename decay<H>::type>
+  template <typename H, typename Handler = decay_t<H>>
   any_completion_handler(H&& h,
-      typename constraint<
-        !is_same<typename decay<H>::type, any_completion_handler>::value
-      >::type = 0)
+      constraint_t<
+        !is_same<decay_t<H>, any_completion_handler>::value
+      > = 0)
     : fn_table_(
         &detail::any_completion_handler_fn_table_instance<
           Handler, Signatures...>::value),
       impl_(detail::any_completion_handler_impl<Handler>::create(
-            (get_associated_cancellation_slot)(h), BOOST_ASIO_MOVE_CAST(H)(h)))
+            (get_associated_cancellation_slot)(h), static_cast<H&&>(h)))
   {
   }
 
@@ -669,7 +669,7 @@ public:
   /**
    * After the operation, the moved-from object @c other has no target.
    */
-  any_completion_handler(any_completion_handler&& other) BOOST_ASIO_NOEXCEPT
+  any_completion_handler(any_completion_handler&& other) noexcept
     : fn_table_(other.fn_table_),
       impl_(other.impl_)
   {
@@ -682,15 +682,15 @@ public:
    * After the operation, the moved-from object @c other has no target.
    */
   any_completion_handler& operator=(
-      any_completion_handler&& other) BOOST_ASIO_NOEXCEPT
+      any_completion_handler&& other) noexcept
   {
     any_completion_handler(
-        BOOST_ASIO_MOVE_CAST(any_completion_handler)(other)).swap(*this);
+        static_cast<any_completion_handler&&>(other)).swap(*this);
     return *this;
   }
 
   /// Assignment operator that sets the polymorphic wrapper to the empty state.
-  any_completion_handler& operator=(nullptr_t) BOOST_ASIO_NOEXCEPT
+  any_completion_handler& operator=(nullptr_t) noexcept
   {
     any_completion_handler().swap(*this);
     return *this;
@@ -704,34 +704,34 @@ public:
   }
 
   /// Test if the polymorphic wrapper is empty.
-  constexpr explicit operator bool() const BOOST_ASIO_NOEXCEPT
+  constexpr explicit operator bool() const noexcept
   {
     return impl_ != nullptr;
   }
 
   /// Test if the polymorphic wrapper is non-empty.
-  constexpr bool operator!() const BOOST_ASIO_NOEXCEPT
+  constexpr bool operator!() const noexcept
   {
     return impl_ == nullptr;
   }
 
   /// Swap the content of an @c any_completion_handler with another.
-  void swap(any_completion_handler& other) BOOST_ASIO_NOEXCEPT
+  void swap(any_completion_handler& other) noexcept
   {
     std::swap(fn_table_, other.fn_table_);
     std::swap(impl_, other.impl_);
   }
 
   /// Get the associated allocator.
-  allocator_type get_allocator() const BOOST_ASIO_NOEXCEPT
+  allocator_type get_allocator() const noexcept
   {
     return allocator_type(0, *this);
   }
 
   /// Get the associated cancellation slot.
-  cancellation_slot_type get_cancellation_slot() const BOOST_ASIO_NOEXCEPT
+  cancellation_slot_type get_cancellation_slot() const noexcept
   {
-    return impl_->get_cancellation_slot();
+    return impl_ ? impl_->get_cancellation_slot() : cancellation_slot_type();
   }
 
   /// Function call operator.
@@ -745,12 +745,12 @@ public:
    */
   template <typename... Args>
   auto operator()(Args&&... args)
-    -> decltype(fn_table_->call(impl_, BOOST_ASIO_MOVE_CAST(Args)(args)...))
+    -> decltype(fn_table_->call(impl_, static_cast<Args&&>(args)...))
   {
     if (detail::any_completion_handler_impl_base* impl = impl_)
     {
       impl_ = nullptr;
-      return fn_table_->call(impl, BOOST_ASIO_MOVE_CAST(Args)(args)...);
+      return fn_table_->call(impl, static_cast<Args&&>(args)...);
     }
     std::bad_function_call ex;
     boost::asio::detail::throw_exception(ex);
@@ -758,28 +758,28 @@ public:
 
   /// Equality operator.
   friend constexpr bool operator==(
-      const any_completion_handler& a, nullptr_t) BOOST_ASIO_NOEXCEPT
+      const any_completion_handler& a, nullptr_t) noexcept
   {
     return a.impl_ == nullptr;
   }
 
   /// Equality operator.
   friend constexpr bool operator==(
-      nullptr_t, const any_completion_handler& b) BOOST_ASIO_NOEXCEPT
+      nullptr_t, const any_completion_handler& b) noexcept
   {
     return nullptr == b.impl_;
   }
 
   /// Inequality operator.
   friend constexpr bool operator!=(
-      const any_completion_handler& a, nullptr_t) BOOST_ASIO_NOEXCEPT
+      const any_completion_handler& a, nullptr_t) noexcept
   {
     return a.impl_ != nullptr;
   }
 
   /// Inequality operator.
   friend constexpr bool operator!=(
-      nullptr_t, const any_completion_handler& b) BOOST_ASIO_NOEXCEPT
+      nullptr_t, const any_completion_handler& b) noexcept
   {
     return nullptr != b.impl_;
   }
@@ -791,10 +791,12 @@ struct associated_executor<any_completion_handler<Signatures...>, Candidate>
   using type = any_completion_executor;
 
   static type get(const any_completion_handler<Signatures...>& handler,
-      const Candidate& candidate = Candidate()) BOOST_ASIO_NOEXCEPT
+      const Candidate& candidate = Candidate()) noexcept
   {
-    return handler.fn_table_->executor(handler.impl_,
-        any_completion_executor(std::nothrow, candidate));
+    any_completion_executor any_candidate(std::nothrow, candidate);
+    return handler.fn_table_
+      ? handler.fn_table_->executor(handler.impl_, any_candidate)
+      : any_candidate;
   }
 };
 
@@ -805,10 +807,12 @@ struct associated_immediate_executor<
   using type = any_completion_executor;
 
   static type get(const any_completion_handler<Signatures...>& handler,
-      const Candidate& candidate = Candidate()) BOOST_ASIO_NOEXCEPT
+      const Candidate& candidate = Candidate()) noexcept
   {
-    return handler.fn_table_->immediate_executor(handler.impl_,
-        any_io_executor(std::nothrow, candidate));
+    any_io_executor any_candidate(std::nothrow, candidate);
+    return handler.fn_table_
+      ? handler.fn_table_->immediate_executor(handler.impl_, any_candidate)
+      : any_candidate;
   }
 };
 
@@ -817,9 +821,4 @@ struct associated_immediate_executor<
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // (defined(BOOST_ASIO_HAS_STD_TUPLE)
-       //     && defined(BOOST_ASIO_HAS_MOVE)
-       //     && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES))
-       //   || defined(GENERATING_DOCUMENTATION)
-
 #endif // BOOST_ASIO_ANY_COMPLETION_HANDLER_HPP

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

@@ -2,7 +2,7 @@
 // any_io_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)
@@ -88,18 +88,16 @@ public:
 #endif // !defined(GENERATING_DOCUMENTATION)
 
   /// Default constructor.
-  BOOST_ASIO_DECL any_io_executor() BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL any_io_executor() noexcept;
 
   /// Construct in an empty state. Equivalent effects to default constructor.
-  BOOST_ASIO_DECL any_io_executor(nullptr_t) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL any_io_executor(nullptr_t) noexcept;
 
   /// Copy constructor.
-  BOOST_ASIO_DECL any_io_executor(const any_io_executor& e) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL any_io_executor(const any_io_executor& e) noexcept;
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move constructor.
-  BOOST_ASIO_DECL any_io_executor(any_io_executor&& e) BOOST_ASIO_NOEXCEPT;
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  BOOST_ASIO_DECL any_io_executor(any_io_executor&& e) noexcept;
 
   /// Construct to point to the same target as another any_executor.
 #if defined(GENERATING_DOCUMENTATION)
@@ -108,8 +106,8 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <typename OtherAnyExecutor>
   any_io_executor(OtherAnyExecutor e,
-      typename constraint<
-        conditional<
+      constraint_t<
+        conditional_t<
           !is_same<OtherAnyExecutor, any_io_executor>::value
             && is_base_of<execution::detail::any_executor_base,
               OtherAnyExecutor>::value,
@@ -117,9 +115,9 @@ public:
             0, supportable_properties_type>::template
               is_valid_target<OtherAnyExecutor>,
           false_type
-        >::type::value
-      >::type = 0)
-    : base_type(BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+        >::value
+      > = 0)
+    : base_type(static_cast<OtherAnyExecutor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
@@ -132,8 +130,8 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <typename OtherAnyExecutor>
   any_io_executor(std::nothrow_t, OtherAnyExecutor e,
-      typename constraint<
-        conditional<
+      constraint_t<
+        conditional_t<
           !is_same<OtherAnyExecutor, any_io_executor>::value
             && is_base_of<execution::detail::any_executor_base,
               OtherAnyExecutor>::value,
@@ -141,22 +139,19 @@ public:
             0, supportable_properties_type>::template
               is_valid_target<OtherAnyExecutor>,
           false_type
-        >::type::value
-      >::type = 0) BOOST_ASIO_NOEXCEPT
-    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(OtherAnyExecutor)(e))
+        >::value
+      > = 0) noexcept
+    : base_type(std::nothrow, static_cast<OtherAnyExecutor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
 
   /// Construct to point to the same target as another any_executor.
   BOOST_ASIO_DECL any_io_executor(std::nothrow_t,
-      const any_io_executor& e) BOOST_ASIO_NOEXCEPT;
+      const any_io_executor& e) noexcept;
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Construct to point to the same target as another any_executor.
-  BOOST_ASIO_DECL any_io_executor(std::nothrow_t,
-      any_io_executor&& e) BOOST_ASIO_NOEXCEPT;
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  BOOST_ASIO_DECL any_io_executor(std::nothrow_t, any_io_executor&& e) noexcept;
 
   /// Construct a polymorphic wrapper for the specified executor.
 #if defined(GENERATING_DOCUMENTATION)
@@ -165,17 +160,17 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
   any_io_executor(Executor e,
-      typename constraint<
-        conditional<
+      constraint_t<
+        conditional_t<
           !is_same<Executor, any_io_executor>::value
             && !is_base_of<execution::detail::any_executor_base,
               Executor>::value,
           execution::detail::is_valid_target_executor<
             Executor, supportable_properties_type>,
           false_type
-        >::type::value
-      >::type = 0)
-    : base_type(BOOST_ASIO_MOVE_CAST(Executor)(e))
+        >::value
+      > = 0)
+    : base_type(static_cast<Executor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
@@ -187,30 +182,27 @@ public:
 #else // defined(GENERATING_DOCUMENTATION)
   template <BOOST_ASIO_EXECUTION_EXECUTOR Executor>
   any_io_executor(std::nothrow_t, Executor e,
-      typename constraint<
-        conditional<
+      constraint_t<
+        conditional_t<
           !is_same<Executor, any_io_executor>::value
             && !is_base_of<execution::detail::any_executor_base,
               Executor>::value,
           execution::detail::is_valid_target_executor<
             Executor, supportable_properties_type>,
           false_type
-        >::type::value
-      >::type = 0) BOOST_ASIO_NOEXCEPT
-    : base_type(std::nothrow, BOOST_ASIO_MOVE_CAST(Executor)(e))
+        >::value
+      > = 0) noexcept
+    : base_type(std::nothrow, static_cast<Executor&&>(e))
   {
   }
 #endif // defined(GENERATING_DOCUMENTATION)
 
   /// Assignment operator.
   BOOST_ASIO_DECL any_io_executor& operator=(
-      const any_io_executor& e) BOOST_ASIO_NOEXCEPT;
+      const any_io_executor& e) noexcept;
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move assignment operator.
-  BOOST_ASIO_DECL any_io_executor& operator=(
-      any_io_executor&& e) BOOST_ASIO_NOEXCEPT;
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+  BOOST_ASIO_DECL any_io_executor& operator=(any_io_executor&& e) noexcept;
 
   /// Assignment operator that sets the polymorphic wrapper to the empty state.
   BOOST_ASIO_DECL any_io_executor& operator=(nullptr_t);
@@ -219,7 +211,7 @@ public:
   BOOST_ASIO_DECL ~any_io_executor();
 
   /// Swap targets with another polymorphic wrapper.
-  BOOST_ASIO_DECL void swap(any_io_executor& other) BOOST_ASIO_NOEXCEPT;
+  BOOST_ASIO_DECL void swap(any_io_executor& other) noexcept;
 
   /// Obtain a polymorphic wrapper with the specified property.
   /**
@@ -232,9 +224,9 @@ public:
    */
   template <typename Property>
   any_io_executor require(const Property& p,
-      typename constraint<
+      constraint_t<
         traits::require_member<const base_type&, const Property&>::is_valid
-      >::type = 0) const
+      > = 0) const
   {
     return static_cast<const base_type&>(*this).require(p);
   }
@@ -250,9 +242,9 @@ public:
    */
   template <typename Property>
   any_io_executor prefer(const Property& p,
-      typename constraint<
+      constraint_t<
         traits::prefer_member<const base_type&, const Property&>::is_valid
-      >::type = 0) const
+      > = 0) const
   {
     return static_cast<const base_type&>(*this).prefer(p);
   }

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

@@ -2,7 +2,7 @@
 // append.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,11 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-
-#if (defined(BOOST_ASIO_HAS_STD_TUPLE) \
-    && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES)) \
-  || defined(GENERATING_DOCUMENTATION)
-
 #include <tuple>
 #include <boost/asio/detail/type_traits.hpp>
 
@@ -38,11 +33,9 @@ class append_t
 public:
   /// Constructor.
   template <typename T, typename... V>
-  BOOST_ASIO_CONSTEXPR explicit append_t(
-      BOOST_ASIO_MOVE_ARG(T) completion_token,
-      BOOST_ASIO_MOVE_ARG(V)... values)
-    : token_(BOOST_ASIO_MOVE_CAST(T)(completion_token)),
-      values_(BOOST_ASIO_MOVE_CAST(V)(values)...)
+  constexpr explicit append_t(T&& completion_token, V&&... values)
+    : token_(static_cast<T&&>(completion_token)),
+      values_(static_cast<V&&>(values)...)
   {
   }
 
@@ -55,15 +48,13 @@ public:
 /// arguments should be passed additional values after the results of the
 /// operation.
 template <typename CompletionToken, typename... Values>
-BOOST_ASIO_NODISCARD inline BOOST_ASIO_CONSTEXPR append_t<
-  typename decay<CompletionToken>::type, typename decay<Values>::type...>
-append(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token,
-    BOOST_ASIO_MOVE_ARG(Values)... values)
+BOOST_ASIO_NODISCARD inline constexpr
+append_t<decay_t<CompletionToken>, decay_t<Values>...>
+append(CompletionToken&& completion_token, Values&&... values)
 {
-  return append_t<
-    typename decay<CompletionToken>::type, typename decay<Values>::type...>(
-      BOOST_ASIO_MOVE_CAST(CompletionToken)(completion_token),
-      BOOST_ASIO_MOVE_CAST(Values)(values)...);
+  return append_t<decay_t<CompletionToken>, decay_t<Values>...>(
+      static_cast<CompletionToken&&>(completion_token),
+      static_cast<Values&&>(values)...);
 }
 
 } // namespace asio
@@ -73,8 +64,4 @@ append(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token,
 
 #include <boost/asio/impl/append.hpp>
 
-#endif // (defined(BOOST_ASIO_HAS_STD_TUPLE)
-       //     && defined(BOOST_ASIO_HAS_VARIADIC_TEMPLATES))
-       //   || defined(GENERATING_DOCUMENTATION)
-
 #endif // BOOST_ASIO_APPEND_HPP