passenger 6.0.20 → 6.0.21

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/basic_endpoint.hpp

@@ -2,7 +2,7 @@
 // generic/basic_endpoint.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)
@@ -55,7 +55,7 @@ public:
 #endif
 
   /// Default constructor.
-  basic_endpoint() BOOST_ASIO_NOEXCEPT
+  basic_endpoint() noexcept
   {
   }
 
@@ -79,13 +79,11 @@ public:
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move constructor.
   basic_endpoint(basic_endpoint&& other)
     : impl_(other.impl_)
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   /// Assign from another endpoint.
   basic_endpoint& operator=(const basic_endpoint& other)
@@ -94,14 +92,12 @@ public:
     return *this;
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   /// Move-assign from another endpoint.
   basic_endpoint& operator=(basic_endpoint&& other)
   {
     impl_ = other.impl_;
     return *this;
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   /// The protocol associated with the endpoint.
   protocol_type protocol() const

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/datagram_protocol.hpp

@@ -2,7 +2,7 @@
 // generic/datagram_protocol.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)
@@ -74,19 +74,19 @@ public:
   }
 
   /// Obtain an identifier for the type of the protocol.
-  int type() const BOOST_ASIO_NOEXCEPT
+  int type() const noexcept
   {
     return BOOST_ASIO_OS_DEF(SOCK_DGRAM);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const BOOST_ASIO_NOEXCEPT
+  int protocol() const noexcept
   {
     return protocol_;
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const BOOST_ASIO_NOEXCEPT
+  int family() const noexcept
   {
     return family_;
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/detail/endpoint.hpp

@@ -2,7 +2,7 @@
 // generic/detail/endpoint.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)

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/detail/impl/endpoint.ipp

@@ -2,7 +2,7 @@
 // generic/detail/impl/endpoint.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)

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/raw_protocol.hpp

@@ -2,7 +2,7 @@
 // generic/raw_protocol.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)
@@ -74,19 +74,19 @@ public:
   }
 
   /// Obtain an identifier for the type of the protocol.
-  int type() const BOOST_ASIO_NOEXCEPT
+  int type() const noexcept
   {
     return BOOST_ASIO_OS_DEF(SOCK_RAW);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const BOOST_ASIO_NOEXCEPT
+  int protocol() const noexcept
   {
     return protocol_;
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const BOOST_ASIO_NOEXCEPT
+  int family() const noexcept
   {
     return family_;
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/seq_packet_protocol.hpp

@@ -2,7 +2,7 @@
 // generic/seq_packet_protocol.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)
@@ -73,19 +73,19 @@ public:
   }
 
   /// Obtain an identifier for the type of the protocol.
-  int type() const BOOST_ASIO_NOEXCEPT
+  int type() const noexcept
   {
     return BOOST_ASIO_OS_DEF(SOCK_SEQPACKET);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const BOOST_ASIO_NOEXCEPT
+  int protocol() const noexcept
   {
     return protocol_;
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const BOOST_ASIO_NOEXCEPT
+  int family() const noexcept
   {
     return family_;
   }

data/src/cxx_supportlib/vendor-modified/boost/asio/generic/stream_protocol.hpp

@@ -2,7 +2,7 @@
 // generic/stream_protocol.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)
@@ -75,19 +75,19 @@ public:
   }
 
   /// Obtain an identifier for the type of the protocol.
-  int type() const BOOST_ASIO_NOEXCEPT
+  int type() const noexcept
   {
     return BOOST_ASIO_OS_DEF(SOCK_STREAM);
   }
 
   /// Obtain an identifier for the protocol.
-  int protocol() const BOOST_ASIO_NOEXCEPT
+  int protocol() const noexcept
   {
     return protocol_;
   }
 
   /// Obtain an identifier for the protocol family.
-  int family() const BOOST_ASIO_NOEXCEPT
+  int family() const noexcept
   {
     return family_;
   }

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

@@ -2,7 +2,7 @@
 // handler_continuation_hook.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)

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

@@ -2,7 +2,7 @@
 // high_resolution_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>
 
@@ -41,6 +38,4 @@ typedef basic_waitable_timer<
 } // namespace asio
 } // namespace boost
 
-#endif // defined(BOOST_ASIO_HAS_CHRONO) || defined(GENERATING_DOCUMENTATION)
-
 #endif // BOOST_ASIO_HIGH_RESOLUTION_TIMER_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/impl/any_completion_executor.ipp

@@ -2,7 +2,7 @@
 // impl/any_completion_executor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// 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)
@@ -26,57 +26,53 @@
 namespace boost {
 namespace asio {
 
-any_completion_executor::any_completion_executor() BOOST_ASIO_NOEXCEPT
+any_completion_executor::any_completion_executor() noexcept
   : base_type()
 {
 }
 
-any_completion_executor::any_completion_executor(nullptr_t) BOOST_ASIO_NOEXCEPT
+any_completion_executor::any_completion_executor(nullptr_t) noexcept
   : base_type(nullptr_t())
 {
 }
 
 any_completion_executor::any_completion_executor(
-    const any_completion_executor& e) BOOST_ASIO_NOEXCEPT
+    const any_completion_executor& e) noexcept
   : base_type(static_cast<const base_type&>(e))
 {
 }
 
 any_completion_executor::any_completion_executor(std::nothrow_t,
-    const any_completion_executor& e) BOOST_ASIO_NOEXCEPT
+    const any_completion_executor& e) noexcept
   : base_type(static_cast<const base_type&>(e))
 {
 }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
 any_completion_executor::any_completion_executor(
-    any_completion_executor&& e) BOOST_ASIO_NOEXCEPT
+    any_completion_executor&& e) noexcept
   : base_type(static_cast<base_type&&>(e))
 {
 }
 
 any_completion_executor::any_completion_executor(std::nothrow_t,
-    any_completion_executor&& e) BOOST_ASIO_NOEXCEPT
+    any_completion_executor&& e) noexcept
   : base_type(static_cast<base_type&&>(e))
 {
 }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
 any_completion_executor& any_completion_executor::operator=(
-    const any_completion_executor& e) BOOST_ASIO_NOEXCEPT
+    const any_completion_executor& e) noexcept
 {
   base_type::operator=(static_cast<const base_type&>(e));
   return *this;
 }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
 any_completion_executor& any_completion_executor::operator=(
-    any_completion_executor&& e) BOOST_ASIO_NOEXCEPT
+    any_completion_executor&& e) noexcept
 {
   base_type::operator=(static_cast<base_type&&>(e));
   return *this;
 }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
 any_completion_executor& any_completion_executor::operator=(nullptr_t)
 {
@@ -89,7 +85,7 @@ any_completion_executor::~any_completion_executor()
 }
 
 void any_completion_executor::swap(
-    any_completion_executor& other) BOOST_ASIO_NOEXCEPT
+    any_completion_executor& other) noexcept
 {
   static_cast<base_type&>(*this).swap(static_cast<base_type&>(other));
 }

data/src/cxx_supportlib/vendor-modified/boost/asio/impl/any_io_executor.ipp

@@ -2,7 +2,7 @@
 // impl/any_io_executor.ipp
 // ~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// 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)
@@ -26,55 +26,48 @@
 namespace boost {
 namespace asio {
 
-any_io_executor::any_io_executor() BOOST_ASIO_NOEXCEPT
+any_io_executor::any_io_executor() noexcept
   : base_type()
 {
 }
 
-any_io_executor::any_io_executor(nullptr_t) BOOST_ASIO_NOEXCEPT
+any_io_executor::any_io_executor(nullptr_t) noexcept
   : base_type(nullptr_t())
 {
 }
 
-any_io_executor::any_io_executor(const any_io_executor& e) BOOST_ASIO_NOEXCEPT
+any_io_executor::any_io_executor(const any_io_executor& e) noexcept
   : base_type(static_cast<const base_type&>(e))
 {
 }
 
 any_io_executor::any_io_executor(std::nothrow_t,
-    const any_io_executor& e) BOOST_ASIO_NOEXCEPT
+    const any_io_executor& e) noexcept
   : base_type(static_cast<const base_type&>(e))
 {
 }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-any_io_executor::any_io_executor(any_io_executor&& e) BOOST_ASIO_NOEXCEPT
+any_io_executor::any_io_executor(any_io_executor&& e) noexcept
   : base_type(static_cast<base_type&&>(e))
 {
 }
 
-any_io_executor::any_io_executor(std::nothrow_t,
-    any_io_executor&& e) BOOST_ASIO_NOEXCEPT
+any_io_executor::any_io_executor(std::nothrow_t, any_io_executor&& e) noexcept
   : base_type(static_cast<base_type&&>(e))
 {
 }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
-any_io_executor& any_io_executor::operator=(
-    const any_io_executor& e) BOOST_ASIO_NOEXCEPT
+any_io_executor& any_io_executor::operator=(const any_io_executor& e) noexcept
 {
   base_type::operator=(static_cast<const base_type&>(e));
   return *this;
 }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-any_io_executor& any_io_executor::operator=(
-    any_io_executor&& e) BOOST_ASIO_NOEXCEPT
+any_io_executor& any_io_executor::operator=(any_io_executor&& e) noexcept
 {
   base_type::operator=(static_cast<base_type&&>(e));
   return *this;
 }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
 any_io_executor& any_io_executor::operator=(nullptr_t)
 {
@@ -86,7 +79,7 @@ any_io_executor::~any_io_executor()
 {
 }
 
-void any_io_executor::swap(any_io_executor& other) BOOST_ASIO_NOEXCEPT
+void any_io_executor::swap(any_io_executor& other) noexcept
 {
   static_cast<base_type&>(*this).swap(static_cast<base_type&>(other));
 }

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

@@ -2,7 +2,7 @@
 // impl/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,15 +16,11 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-
 #include <boost/asio/associator.hpp>
 #include <boost/asio/async_result.hpp>
-#include <boost/asio/detail/handler_alloc_helpers.hpp>
 #include <boost/asio/detail/handler_cont_helpers.hpp>
-#include <boost/asio/detail/handler_invoke_helpers.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/detail/utility.hpp>
-#include <boost/asio/detail/variadic_templates.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -40,26 +36,26 @@ public:
   typedef void result_type;
 
   template <typename H>
-  append_handler(BOOST_ASIO_MOVE_ARG(H) handler, std::tuple<Values...> values)
-    : handler_(BOOST_ASIO_MOVE_CAST(H)(handler)),
-      values_(BOOST_ASIO_MOVE_CAST(std::tuple<Values...>)(values))
+  append_handler(H&& handler, std::tuple<Values...> values)
+    : handler_(static_cast<H&&>(handler)),
+      values_(static_cast<std::tuple<Values...>&&>(values))
   {
   }
 
   template <typename... Args>
-  void operator()(BOOST_ASIO_MOVE_ARG(Args)... args)
+  void operator()(Args&&... args)
   {
     this->invoke(
         index_sequence_for<Values...>{},
-        BOOST_ASIO_MOVE_CAST(Args)(args)...);
+        static_cast<Args&&>(args)...);
   }
 
   template <std::size_t... I, typename... Args>
-  void invoke(index_sequence<I...>, BOOST_ASIO_MOVE_ARG(Args)... args)
+  void invoke(index_sequence<I...>, Args&&... args)
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
-        BOOST_ASIO_MOVE_CAST(Args)(args)...,
-        BOOST_ASIO_MOVE_CAST(Values)(std::get<I>(values_))...);
+    static_cast<Handler&&>(handler_)(
+        static_cast<Args&&>(args)...,
+        static_cast<Values&&>(std::get<I>(values_))...);
   }
 
 //private:
@@ -67,32 +63,6 @@ public:
   std::tuple<Values...> values_;
 };
 
-template <typename Handler>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    append_handler<Handler>* this_handler)
-{
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-  boost_asio_handler_alloc_helpers::allocate(size, this_handler->handler_);
-  return asio_handler_allocate_is_no_longer_used();
-#else // defined(BOOST_ASIO_NO_DEPRECATED)
-  return boost_asio_handler_alloc_helpers::allocate(
-      size, this_handler->handler_);
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
-template <typename Handler>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    append_handler<Handler>* this_handler)
-{
-  boost_asio_handler_alloc_helpers::deallocate(
-      pointer, size, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-  return asio_handler_deallocate_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
 template <typename Handler>
 inline bool asio_handler_is_continuation(
     append_handler<Handler>* this_handler)
@@ -101,37 +71,13 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    append_handler<Handler>* this_handler)
-{
-  boost_asio_handler_invoke_helpers::invoke(
-      function, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-  return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
-template <typename Function, typename Handler>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    append_handler<Handler>* this_handler)
-{
-  boost_asio_handler_invoke_helpers::invoke(
-      function, this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-  return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
 template <typename Signature, typename... Values>
 struct append_signature;
 
 template <typename R, typename... Args, typename... Values>
 struct append_signature<R(Args...), Values...>
 {
-  typedef R type(typename decay<Args>::type..., Values...);
+  typedef R type(decay_t<Args>..., Values...);
 };
 
 } // namespace detail
@@ -139,8 +85,7 @@ struct append_signature<R(Args...), Values...>
 #if !defined(GENERATING_DOCUMENTATION)
 
 template <typename CompletionToken, typename... Values, typename Signature>
-struct async_result<
-    append_t<CompletionToken, Values...>, Signature>
+struct async_result<append_t<CompletionToken, Values...>, Signature>
   : async_result<CompletionToken,
       typename detail::append_signature<
         Signature, Values...>::type>
@@ -152,45 +97,40 @@ struct async_result<
   struct init_wrapper
   {
     init_wrapper(Initiation init)
-      : initiation_(BOOST_ASIO_MOVE_CAST(Initiation)(init))
+      : initiation_(static_cast<Initiation&&>(init))
     {
     }
 
     template <typename Handler, typename... Args>
-    void operator()(
-        BOOST_ASIO_MOVE_ARG(Handler) handler,
-        std::tuple<Values...> values,
-        BOOST_ASIO_MOVE_ARG(Args)... args)
+    void operator()(Handler&& handler,
+        std::tuple<Values...> values, Args&&... args)
     {
-      BOOST_ASIO_MOVE_CAST(Initiation)(initiation_)(
-          detail::append_handler<
-            typename decay<Handler>::type, Values...>(
-              BOOST_ASIO_MOVE_CAST(Handler)(handler),
-              BOOST_ASIO_MOVE_CAST(std::tuple<Values...>)(values)),
-          BOOST_ASIO_MOVE_CAST(Args)(args)...);
+      static_cast<Initiation&&>(initiation_)(
+          detail::append_handler<decay_t<Handler>, Values...>(
+            static_cast<Handler&&>(handler),
+            static_cast<std::tuple<Values...>&&>(values)),
+          static_cast<Args&&>(args)...);
     }
 
     Initiation initiation_;
   };
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
-  static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(CompletionToken, signature,
-      (async_initiate<CompletionToken, signature>(
-        declval<init_wrapper<typename decay<Initiation>::type> >(),
-        declval<CompletionToken&>(),
-        declval<std::tuple<Values...> >(),
-        declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
-  initiate(
-      BOOST_ASIO_MOVE_ARG(Initiation) initiation,
-      BOOST_ASIO_MOVE_ARG(RawCompletionToken) token,
-      BOOST_ASIO_MOVE_ARG(Args)... args)
+  static auto initiate(Initiation&& initiation,
+      RawCompletionToken&& token, Args&&... args)
+    -> decltype(
+      async_initiate<CompletionToken, signature>(
+        declval<init_wrapper<decay_t<Initiation>>>(),
+        token.token_,
+        static_cast<std::tuple<Values...>&&>(token.values_),
+        static_cast<Args&&>(args)...))
   {
     return async_initiate<CompletionToken, signature>(
-        init_wrapper<typename decay<Initiation>::type>(
-          BOOST_ASIO_MOVE_CAST(Initiation)(initiation)),
+        init_wrapper<decay_t<Initiation>>(
+          static_cast<Initiation&&>(initiation)),
         token.token_,
-        BOOST_ASIO_MOVE_CAST(std::tuple<Values...>)(token.values_),
-        BOOST_ASIO_MOVE_CAST(Args)(args)...);
+        static_cast<std::tuple<Values...>&&>(token.values_),
+        static_cast<Args&&>(args)...);
   }
 };
 
@@ -200,18 +140,15 @@ struct associator<Associator,
     detail::append_handler<Handler, Values...>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::append_handler<Handler, Values...>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::append_handler<Handler, Values...>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::append_handler<Handler, Values...>& h,
-      const DefaultCandidate& c) BOOST_ASIO_NOEXCEPT
-    BOOST_ASIO_AUTO_RETURN_TYPE_SUFFIX((
-      Associator<Handler, DefaultCandidate>::get(h.handler_, c)))
+  static auto get(const detail::append_handler<Handler, Values...>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }