passenger 6.0.20 → 6.0.21

data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/as_single.hpp

@@ -2,7 +2,7 @@
 // experimental/as_single.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)
@@ -48,18 +48,18 @@ public:
    * token is itself defaulted as an argument to allow it to capture a source
    * location.
    */
-  BOOST_ASIO_CONSTEXPR as_single_t(
+  constexpr as_single_t(
       default_constructor_tag = default_constructor_tag(),
       CompletionToken token = CompletionToken())
-    : token_(BOOST_ASIO_MOVE_CAST(CompletionToken)(token))
+    : token_(static_cast<CompletionToken&&>(token))
   {
   }
 
   /// Constructor.
   template <typename T>
-  BOOST_ASIO_CONSTEXPR explicit as_single_t(
-      BOOST_ASIO_MOVE_ARG(T) completion_token)
-    : token_(BOOST_ASIO_MOVE_CAST(T)(completion_token))
+  constexpr explicit as_single_t(
+      T&& completion_token)
+    : token_(static_cast<T&&>(completion_token))
   {
   }
 
@@ -72,7 +72,7 @@ public:
     typedef as_single_t default_completion_token_type;
 
     /// Construct the adapted executor from the inner executor type.
-    executor_with_default(const InnerExecutor& ex) BOOST_ASIO_NOEXCEPT
+    executor_with_default(const InnerExecutor& ex) noexcept
       : InnerExecutor(ex)
     {
     }
@@ -81,9 +81,9 @@ public:
     /// that to construct the adapted executor.
     template <typename OtherExecutor>
     executor_with_default(const OtherExecutor& ex,
-        typename constraint<
+        constraint_t<
           is_convertible<OtherExecutor, InnerExecutor>::value
-        >::type = 0) BOOST_ASIO_NOEXCEPT
+        > = 0) noexcept
       : InnerExecutor(ex)
     {
     }
@@ -91,25 +91,21 @@ public:
 
   /// Type alias to adapt an I/O object to use @c as_single_t as its
   /// default completion token type.
-#if defined(BOOST_ASIO_HAS_ALIAS_TEMPLATES) \
-  || defined(GENERATING_DOCUMENTATION)
   template <typename T>
   using as_default_on_t = typename T::template rebind_executor<
-      executor_with_default<typename T::executor_type> >::other;
-#endif // defined(BOOST_ASIO_HAS_ALIAS_TEMPLATES)
-       //   || defined(GENERATING_DOCUMENTATION)
+      executor_with_default<typename T::executor_type>>::other;
 
   /// Function helper to adapt an I/O object to use @c as_single_t as its
   /// default completion token type.
   template <typename T>
-  static typename decay<T>::type::template rebind_executor<
-      executor_with_default<typename decay<T>::type::executor_type>
+  static typename decay_t<T>::template rebind_executor<
+      executor_with_default<typename decay_t<T>::executor_type>
     >::other
-  as_default_on(BOOST_ASIO_MOVE_ARG(T) object)
+  as_default_on(T&& object)
   {
-    return typename decay<T>::type::template rebind_executor<
-        executor_with_default<typename decay<T>::type::executor_type>
-      >::other(BOOST_ASIO_MOVE_CAST(T)(object));
+    return typename decay_t<T>::template rebind_executor<
+        executor_with_default<typename decay_t<T>::executor_type>
+      >::other(static_cast<T&&>(object));
   }
 
 //private:
@@ -120,11 +116,11 @@ public:
 /// arguments should be combined into a single argument.
 template <typename CompletionToken>
 BOOST_ASIO_NODISCARD inline
-BOOST_ASIO_CONSTEXPR as_single_t<typename decay<CompletionToken>::type>
-as_single(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token)
+constexpr as_single_t<decay_t<CompletionToken>>
+as_single(CompletionToken&& completion_token)
 {
-  return as_single_t<typename decay<CompletionToken>::type>(
-      BOOST_ASIO_MOVE_CAST(CompletionToken)(completion_token));
+  return as_single_t<decay_t<CompletionToken>>(
+      static_cast<CompletionToken&&>(completion_token));
 }
 
 } // namespace experimental

data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/as_tuple.hpp

@@ -2,7 +2,7 @@
 // experimental/as_tuple.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/experimental/awaitable_operators.hpp

@@ -2,7 +2,7 @@
 // experimental/awaitable_operators.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)
@@ -38,28 +38,28 @@ namespace detail {
 
 template <typename T, typename Executor>
 awaitable<T, Executor> awaitable_wrap(awaitable<T, Executor> a,
-    typename constraint<is_constructible<T>::value>::type* = 0)
+    constraint_t<is_constructible<T>::value>* = 0)
 {
   return a;
 }
 
 template <typename T, typename Executor>
 awaitable<std::optional<T>, Executor> awaitable_wrap(awaitable<T, Executor> a,
-    typename constraint<!is_constructible<T>::value>::type* = 0)
+    constraint_t<!is_constructible<T>::value>* = 0)
 {
   co_return std::optional<T>(co_await std::move(a));
 }
 
 template <typename T>
-T& awaitable_unwrap(typename conditional<true, T, void>::type& r,
-    typename constraint<is_constructible<T>::value>::type* = 0)
+T& awaitable_unwrap(conditional_t<true, T, void>& r,
+    constraint_t<is_constructible<T>::value>* = 0)
 {
   return r;
 }
 
 template <typename T>
-T& awaitable_unwrap(std::optional<typename conditional<true, T, void>::type>& r,
-    typename constraint<!is_constructible<T>::value>::type* = 0)
+T& awaitable_unwrap(std::optional<conditional_t<true, T, void>>& r,
+    constraint_t<!is_constructible<T>::value>* = 0)
 {
   return *r;
 }

data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/basic_channel.hpp

@@ -2,7 +2,7 @@
 // experimental/basic_channel.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)
@@ -112,7 +112,7 @@ private:
   template <typename... PayloadSignatures,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(PayloadSignatures...) CompletionToken>
   auto do_async_receive(detail::channel_payload<PayloadSignatures...>*,
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token)
+      CompletionToken&& token)
     -> decltype(
         async_initiate<CompletionToken, PayloadSignatures...>(
           declval<initiate_async_receive>(), token))
@@ -168,10 +168,10 @@ public:
    */
   template <typename ExecutionContext>
   basic_channel(ExecutionContext& context, std::size_t max_buffer_size = 0,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value,
         defaulted_constraint
-      >::type = defaulted_constraint())
+      > = defaulted_constraint())
     : service_(&boost::asio::use_service<service_type>(context)),
       impl_(),
       executor_(context.get_executor())
@@ -179,7 +179,6 @@ public:
     service_->construct(impl_, max_buffer_size);
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move-construct a basic_channel from another.
   /**
    * This constructor moves a channel from one object to another.
@@ -237,9 +236,9 @@ public:
   template <typename Executor1>
   basic_channel(
       basic_channel<Executor1, Traits, Signatures...>&& other,
-      typename constraint<
+      constraint_t<
           is_convertible<Executor1, Executor>::value
-      >::type = 0)
+      > = 0)
     : service_(other.service_),
       executor_(other.executor_)
   {
@@ -260,10 +259,10 @@ public:
    * constructor.
    */
   template <typename Executor1>
-  typename constraint<
+  constraint_t<
     is_convertible<Executor1, Executor>::value,
     basic_channel&
-  >::type operator=(basic_channel<Executor1, Traits, Signatures...>&& other)
+  > operator=(basic_channel<Executor1, Traits, Signatures...>&& other)
   {
     if (this != &other)
     {
@@ -274,7 +273,6 @@ public:
     }
     return *this;
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   /// Destructor.
   ~basic_channel()
@@ -283,19 +281,19 @@ public:
   }
 
   /// Get the executor associated with the object.
-  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() noexcept
   {
     return executor_;
   }
 
   /// Get the capacity of the channel's buffer.
-  std::size_t capacity() BOOST_ASIO_NOEXCEPT
+  std::size_t capacity() noexcept
   {
     return service_->capacity(impl_);
   }
 
   /// Determine whether the channel is open.
-  bool is_open() const BOOST_ASIO_NOEXCEPT
+  bool is_open() const noexcept
   {
     return service_->is_open(impl_);
   }
@@ -324,7 +322,7 @@ public:
   }
 
   /// Determine whether a message can be received without blocking.
-  bool ready() const BOOST_ASIO_NOEXCEPT
+  bool ready() const noexcept
   {
     return service_->ready(impl_);
   }
@@ -338,14 +336,38 @@ public:
    * @returns @c true on success, @c false on failure.
    */
   template <typename... Args>
-  bool try_send(BOOST_ASIO_MOVE_ARG(Args)... args);
+  bool try_send(Args&&... args);
+
+  /// Try to send a message without blocking, using dispatch semantics to call
+  /// the receive operation's completion handler.
+  /**
+   * Fails if the buffer is full and there are no waiting receive operations.
+   *
+   * The receive operation's completion handler may be called from inside this
+   * function.
+   *
+   * @returns @c true on success, @c false on failure.
+   */
+  template <typename... Args>
+  bool try_send_via_dispatch(Args&&... args);
 
   /// Try to send a number of messages without blocking.
   /**
    * @returns The number of messages that were sent.
    */
   template <typename... Args>
-  std::size_t try_send_n(std::size_t count, BOOST_ASIO_MOVE_ARG(Args)... args);
+  std::size_t try_send_n(std::size_t count, Args&&... args);
+
+  /// Try to send a number of messages without blocking, using dispatch
+  /// semantics to call the receive operations' completion handlers.
+  /**
+   * The receive operations' completion handlers may be called from inside this
+   * function.
+   *
+   * @returns The number of messages that were sent.
+   */
+  template <typename... Args>
+  std::size_t try_send_n_via_dispatch(std::size_t count, Args&&... args);
 
   /// Asynchronously send a message.
   /**
@@ -355,8 +377,8 @@ public:
   template <typename... Args,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
         CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  auto async_send(BOOST_ASIO_MOVE_ARG(Args)... args,
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token);
+  auto async_send(Args&&... args,
+      CompletionToken&& token);
 
 #endif // defined(GENERATING_DOCUMENTATION)
 
@@ -367,9 +389,9 @@ public:
    * @returns @c true on success, @c false on failure.
    */
   template <typename Handler>
-  bool try_receive(BOOST_ASIO_MOVE_ARG(Handler) handler)
+  bool try_receive(Handler&& handler)
   {
-    return service_->try_receive(impl_, BOOST_ASIO_MOVE_CAST(Handler)(handler));
+    return service_->try_receive(impl_, static_cast<Handler&&>(handler));
   }
 
   /// Asynchronously receive a message.
@@ -381,22 +403,22 @@ public:
   template <typename CompletionToken
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
   auto async_receive(
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token
+      CompletionToken&& token
         BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(Executor))
 #if !defined(GENERATING_DOCUMENTATION)
     -> decltype(
         this->do_async_receive(static_cast<payload_type*>(0),
-          BOOST_ASIO_MOVE_CAST(CompletionToken)(token)))
+          static_cast<CompletionToken&&>(token)))
 #endif // !defined(GENERATING_DOCUMENTATION)
   {
     return this->do_async_receive(static_cast<payload_type*>(0),
-        BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+        static_cast<CompletionToken&&>(token));
   }
 
 private:
   // Disallow copying and assignment.
-  basic_channel(const basic_channel&) BOOST_ASIO_DELETED;
-  basic_channel& operator=(const basic_channel&) BOOST_ASIO_DELETED;
+  basic_channel(const basic_channel&) = delete;
+  basic_channel& operator=(const basic_channel&) = delete;
 
   template <typename, typename, typename...>
   friend class detail::channel_send_functions;
@@ -404,7 +426,7 @@ private:
   // Helper function to get an executor's context.
   template <typename T>
   static execution_context& get_context(const T& t,
-      typename enable_if<execution::is_executor<T>::value>::type* = 0)
+      enable_if_t<execution::is_executor<T>::value>* = 0)
   {
     return boost::asio::query(t, execution::context);
   }
@@ -412,7 +434,7 @@ private:
   // Helper function to get an executor's context.
   template <typename T>
   static execution_context& get_context(const T& t,
-      typename enable_if<!execution::is_executor<T>::value>::type* = 0)
+      enable_if_t<!execution::is_executor<T>::value>* = 0)
   {
     return t.context();
   }
@@ -427,18 +449,18 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename SendHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(SendHandler) handler,
-        BOOST_ASIO_MOVE_ARG(payload_type) payload) const
+    void operator()(SendHandler&& handler,
+        payload_type&& payload) const
     {
       boost::asio::detail::non_const_lvalue<SendHandler> handler2(handler);
       self_->service_->async_send(self_->impl_,
-          BOOST_ASIO_MOVE_CAST(payload_type)(payload),
+          static_cast<payload_type&&>(payload),
           handler2.value, self_->get_executor());
     }
 
@@ -456,13 +478,13 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename ReceiveHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(ReceiveHandler) handler) const
+    void operator()(ReceiveHandler&& handler) const
     {
       boost::asio::detail::non_const_lvalue<ReceiveHandler> handler2(handler);
       self_->service_->async_receive(self_->impl_,

data/src/cxx_supportlib/vendor-modified/boost/asio/experimental/basic_concurrent_channel.hpp

@@ -2,7 +2,7 @@
 // experimental/basic_concurrent_channel.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)
@@ -112,7 +112,7 @@ private:
   template <typename... PayloadSignatures,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(PayloadSignatures...) CompletionToken>
   auto do_async_receive(detail::channel_payload<PayloadSignatures...>*,
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token)
+      CompletionToken&& token)
     -> decltype(
         async_initiate<CompletionToken, PayloadSignatures...>(
           declval<initiate_async_receive>(), token))
@@ -170,10 +170,10 @@ public:
   template <typename ExecutionContext>
   basic_concurrent_channel(ExecutionContext& context,
       std::size_t max_buffer_size = 0,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value,
         defaulted_constraint
-      >::type = defaulted_constraint())
+      > = defaulted_constraint())
     : service_(&boost::asio::use_service<service_type>(context)),
       impl_(),
       executor_(context.get_executor())
@@ -181,7 +181,6 @@ public:
     service_->construct(impl_, max_buffer_size);
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move-construct a basic_concurrent_channel from another.
   /**
    * This constructor moves a channel from one object to another.
@@ -243,9 +242,9 @@ public:
   template <typename Executor1>
   basic_concurrent_channel(
       basic_concurrent_channel<Executor1, Traits, Signatures...>&& other,
-      typename constraint<
+      constraint_t<
           is_convertible<Executor1, Executor>::value
-      >::type = 0)
+      > = 0)
     : service_(other.service_),
       executor_(other.executor_)
   {
@@ -266,10 +265,10 @@ public:
    * constructor.
    */
   template <typename Executor1>
-  typename constraint<
+  constraint_t<
     is_convertible<Executor1, Executor>::value,
     basic_concurrent_channel&
-  >::type operator=(
+  > operator=(
       basic_concurrent_channel<Executor1, Traits, Signatures...>&& other)
   {
     if (this != &other)
@@ -281,7 +280,6 @@ public:
     }
     return *this;
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   /// Destructor.
   ~basic_concurrent_channel()
@@ -290,19 +288,19 @@ public:
   }
 
   /// Get the executor associated with the object.
-  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() noexcept
   {
     return executor_;
   }
 
   /// Get the capacity of the channel's buffer.
-  std::size_t capacity() BOOST_ASIO_NOEXCEPT
+  std::size_t capacity() noexcept
   {
     return service_->capacity(impl_);
   }
 
   /// Determine whether the channel is open.
-  bool is_open() const BOOST_ASIO_NOEXCEPT
+  bool is_open() const noexcept
   {
     return service_->is_open(impl_);
   }
@@ -331,7 +329,7 @@ public:
   }
 
   /// Determine whether a message can be received without blocking.
-  bool ready() const BOOST_ASIO_NOEXCEPT
+  bool ready() const noexcept
   {
     return service_->ready(impl_);
   }
@@ -345,21 +343,45 @@ public:
    * @returns @c true on success, @c false on failure.
    */
   template <typename... Args>
-  bool try_send(BOOST_ASIO_MOVE_ARG(Args)... args);
+  bool try_send(Args&&... args);
+
+  /// Try to send a message without blocking, using dispatch semantics to call
+  /// the receive operation's completion handler.
+  /**
+   * Fails if the buffer is full and there are no waiting receive operations.
+   *
+   * The receive operation's completion handler may be called from inside this
+   * function.
+   *
+   * @returns @c true on success, @c false on failure.
+   */
+  template <typename... Args>
+  bool try_send_via_dispatch(Args&&... args);
 
   /// Try to send a number of messages without blocking.
   /**
    * @returns The number of messages that were sent.
    */
   template <typename... Args>
-  std::size_t try_send_n(std::size_t count, BOOST_ASIO_MOVE_ARG(Args)... args);
+  std::size_t try_send_n(std::size_t count, Args&&... args);
+
+  /// Try to send a number of messages without blocking, using dispatch
+  /// semantics to call the receive operations' completion handlers.
+  /**
+   * The receive operations' completion handlers may be called from inside this
+   * function.
+   *
+   * @returns The number of messages that were sent.
+   */
+  template <typename... Args>
+  std::size_t try_send_n_via_dispatch(std::size_t count, Args&&... args);
 
   /// Asynchronously send a message.
   template <typename... Args,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
         CompletionToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  auto async_send(BOOST_ASIO_MOVE_ARG(Args)... args,
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token);
+  auto async_send(Args&&... args,
+      CompletionToken&& token);
 
 #endif // defined(GENERATING_DOCUMENTATION)
 
@@ -370,33 +392,33 @@ public:
    * @returns @c true on success, @c false on failure.
    */
   template <typename Handler>
-  bool try_receive(BOOST_ASIO_MOVE_ARG(Handler) handler)
+  bool try_receive(Handler&& handler)
   {
-    return service_->try_receive(impl_, BOOST_ASIO_MOVE_CAST(Handler)(handler));
+    return service_->try_receive(impl_, static_cast<Handler&&>(handler));
   }
 
   /// Asynchronously receive a message.
   template <typename CompletionToken
       BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
   auto async_receive(
-      BOOST_ASIO_MOVE_ARG(CompletionToken) token
+      CompletionToken&& token
         BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(Executor))
 #if !defined(GENERATING_DOCUMENTATION)
     -> decltype(
         this->do_async_receive(static_cast<payload_type*>(0),
-          BOOST_ASIO_MOVE_CAST(CompletionToken)(token)))
+          static_cast<CompletionToken&&>(token)))
 #endif // !defined(GENERATING_DOCUMENTATION)
   {
     return this->do_async_receive(static_cast<payload_type*>(0),
-        BOOST_ASIO_MOVE_CAST(CompletionToken)(token));
+        static_cast<CompletionToken&&>(token));
   }
 
 private:
   // Disallow copying and assignment.
   basic_concurrent_channel(
-      const basic_concurrent_channel&) BOOST_ASIO_DELETED;
+      const basic_concurrent_channel&) = delete;
   basic_concurrent_channel& operator=(
-      const basic_concurrent_channel&) BOOST_ASIO_DELETED;
+      const basic_concurrent_channel&) = delete;
 
   template <typename, typename, typename...>
   friend class detail::channel_send_functions;
@@ -404,7 +426,7 @@ private:
   // Helper function to get an executor's context.
   template <typename T>
   static execution_context& get_context(const T& t,
-      typename enable_if<execution::is_executor<T>::value>::type* = 0)
+      enable_if_t<execution::is_executor<T>::value>* = 0)
   {
     return boost::asio::query(t, execution::context);
   }
@@ -412,7 +434,7 @@ private:
   // Helper function to get an executor's context.
   template <typename T>
   static execution_context& get_context(const T& t,
-      typename enable_if<!execution::is_executor<T>::value>::type* = 0)
+      enable_if_t<!execution::is_executor<T>::value>* = 0)
   {
     return t.context();
   }
@@ -427,18 +449,18 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename SendHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(SendHandler) handler,
-        BOOST_ASIO_MOVE_ARG(payload_type) payload) const
+    void operator()(SendHandler&& handler,
+        payload_type&& payload) const
     {
       boost::asio::detail::non_const_lvalue<SendHandler> handler2(handler);
       self_->service_->async_send(self_->impl_,
-          BOOST_ASIO_MOVE_CAST(payload_type)(payload),
+          static_cast<payload_type&&>(payload),
           handler2.value, self_->get_executor());
     }
 
@@ -456,13 +478,13 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename ReceiveHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(ReceiveHandler) handler) const
+    void operator()(ReceiveHandler&& handler) const
     {
       boost::asio::detail::non_const_lvalue<ReceiveHandler> handler2(handler);
       self_->service_->async_receive(self_->impl_,