passenger 6.0.20 → 6.0.22

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

@@ -2,7 +2,7 @@
 // basic_socket_acceptor.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)
@@ -15,6 +15,7 @@
 # pragma once
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
+#include <utility>
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/basic_socket.hpp>
@@ -37,10 +38,6 @@
 # include <boost/asio/detail/reactive_socket_service.hpp>
 #endif
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-# include <utility>
-#endif // defined(BOOST_ASIO_HAS_MOVE)
-
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
@@ -152,9 +149,9 @@ public:
    */
   template <typename ExecutionContext>
   explicit basic_socket_acceptor(ExecutionContext& context,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
     : impl_(0, 0, context)
   {
   }
@@ -194,10 +191,10 @@ public:
   template <typename ExecutionContext>
   basic_socket_acceptor(ExecutionContext& context,
       const protocol_type& protocol,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value,
         defaulted_constraint
-      >::type = defaulted_constraint())
+      > = defaulted_constraint())
     : impl_(0, 0, context)
   {
     boost::system::error_code ec;
@@ -283,9 +280,9 @@ public:
   template <typename ExecutionContext>
   basic_socket_acceptor(ExecutionContext& context,
       const endpoint_type& endpoint, bool reuse_addr = true,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
     : impl_(0, 0, context)
   {
     boost::system::error_code ec;
@@ -348,9 +345,9 @@ public:
   template <typename ExecutionContext>
   basic_socket_acceptor(ExecutionContext& context,
       const protocol_type& protocol, const native_handle_type& native_acceptor,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
     : impl_(0, 0, context)
   {
     boost::system::error_code ec;
@@ -359,7 +356,6 @@ public:
     boost::asio::detail::throw_error(ec, "assign");
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Move-construct a basic_socket_acceptor from another.
   /**
    * This constructor moves an acceptor from one object to another.
@@ -371,7 +367,7 @@ public:
    * constructed using the @c basic_socket_acceptor(const executor_type&)
    * constructor.
    */
-  basic_socket_acceptor(basic_socket_acceptor&& other) BOOST_ASIO_NOEXCEPT
+  basic_socket_acceptor(basic_socket_acceptor&& other) noexcept
     : impl_(std::move(other.impl_))
   {
   }
@@ -411,10 +407,10 @@ public:
    */
   template <typename Protocol1, typename Executor1>
   basic_socket_acceptor(basic_socket_acceptor<Protocol1, Executor1>&& other,
-      typename constraint<
+      constraint_t<
         is_convertible<Protocol1, Protocol>::value
           && is_convertible<Executor1, Executor>::value
-      >::type = 0)
+      > = 0)
     : impl_(std::move(other.impl_))
   {
   }
@@ -432,17 +428,16 @@ public:
    * constructor.
    */
   template <typename Protocol1, typename Executor1>
-  typename constraint<
+  constraint_t<
     is_convertible<Protocol1, Protocol>::value
       && is_convertible<Executor1, Executor>::value,
     basic_socket_acceptor&
-  >::type operator=(basic_socket_acceptor<Protocol1, Executor1>&& other)
+  > operator=(basic_socket_acceptor<Protocol1, Executor1>&& other)
   {
     basic_socket_acceptor tmp(std::move(other));
     impl_ = std::move(tmp.impl_);
     return *this;
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
   /// Destroys the acceptor.
   /**
@@ -455,7 +450,7 @@ public:
   }
 
   /// Get the executor associated with the object.
-  const executor_type& get_executor() BOOST_ASIO_NOEXCEPT
+  const executor_type& get_executor() noexcept
   {
     return impl_.get_executor();
   }
@@ -1255,15 +1250,12 @@ public:
    */
   template <
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
-        WaitToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(WaitToken,
-      void (boost::system::error_code))
-  async_wait(wait_type w,
-      BOOST_ASIO_MOVE_ARG(WaitToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+        WaitToken = default_completion_token_t<executor_type>>
+  auto async_wait(wait_type w,
+      WaitToken&& token = default_completion_token_t<executor_type>())
+    -> decltype(
       async_initiate<WaitToken, void (boost::system::error_code)>(
-          declval<initiate_async_wait>(), token, w)))
+        declval<initiate_async_wait>(), token, w))
   {
     return async_initiate<WaitToken, void (boost::system::error_code)>(
         initiate_async_wait(this), token, w);
@@ -1290,9 +1282,9 @@ public:
    */
   template <typename Protocol1, typename Executor1>
   void accept(basic_socket<Protocol1, Executor1>& peer,
-      typename constraint<
+      constraint_t<
         is_convertible<Protocol, Protocol1>::value
-      >::type = 0)
+      > = 0)
   {
     boost::system::error_code ec;
     impl_.get_service().accept(impl_.get_implementation(),
@@ -1326,9 +1318,9 @@ public:
   template <typename Protocol1, typename Executor1>
   BOOST_ASIO_SYNC_OP_VOID accept(
       basic_socket<Protocol1, Executor1>& peer, boost::system::error_code& ec,
-      typename constraint<
+      constraint_t<
         is_convertible<Protocol, Protocol1>::value
-      >::type = 0)
+      > = 0)
   {
     impl_.get_service().accept(impl_.get_implementation(),
         peer, static_cast<endpoint_type*>(0), ec);
@@ -1392,19 +1384,16 @@ public:
    */
   template <typename Protocol1, typename Executor1,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
-        AcceptToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(AcceptToken,
-      void (boost::system::error_code))
-  async_accept(basic_socket<Protocol1, Executor1>& peer,
-      BOOST_ASIO_MOVE_ARG(AcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type),
-      typename constraint<
+        AcceptToken = default_completion_token_t<executor_type>>
+  auto async_accept(basic_socket<Protocol1, Executor1>& peer,
+      AcceptToken&& token = default_completion_token_t<executor_type>(),
+      constraint_t<
         is_convertible<Protocol, Protocol1>::value
-      >::type = 0)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      > = 0)
+    -> decltype(
       async_initiate<AcceptToken, void (boost::system::error_code)>(
-          declval<initiate_async_accept>(), token,
-          &peer, static_cast<endpoint_type*>(0))))
+        declval<initiate_async_accept>(), token,
+        &peer, static_cast<endpoint_type*>(0)))
   {
     return async_initiate<AcceptToken, void (boost::system::error_code)>(
         initiate_async_accept(this), token,
@@ -1525,23 +1514,19 @@ public:
    */
   template <typename Executor1,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code))
-        AcceptToken BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(AcceptToken,
-      void (boost::system::error_code))
-  async_accept(basic_socket<protocol_type, Executor1>& peer,
+        AcceptToken = default_completion_token_t<executor_type>>
+  auto async_accept(basic_socket<protocol_type, Executor1>& peer,
       endpoint_type& peer_endpoint,
-      BOOST_ASIO_MOVE_ARG(AcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      AcceptToken&& token = default_completion_token_t<executor_type>())
+    -> decltype(
       async_initiate<AcceptToken, void (boost::system::error_code)>(
-          declval<initiate_async_accept>(), token, &peer, &peer_endpoint)))
+        declval<initiate_async_accept>(), token, &peer, &peer_endpoint))
   {
     return async_initiate<AcceptToken, void (boost::system::error_code)>(
         initiate_async_accept(this), token, &peer, &peer_endpoint);
   }
 #endif // !defined(BOOST_ASIO_NO_EXTENSIONS)
 
-#if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
   /// Accept a new connection.
   /**
    * This function is used to accept a new connection from a peer. The function
@@ -1671,22 +1656,17 @@ public:
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
           executor_type>::other)) MoveAcceptToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template
-          rebind_executor<executor_type>::other))
-  async_accept(
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+            = default_completion_token_t<executor_type>>
+  auto async_accept(
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>())
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code, typename Protocol::socket::template
           rebind_executor<executor_type>::other)>(
             declval<initiate_async_move_accept>(), token,
-            declval<executor_type>(), static_cast<endpoint_type*>(0),
+            declval<const executor_type&>(), static_cast<endpoint_type*>(0),
             static_cast<typename Protocol::socket::template
-              rebind_executor<executor_type>::other*>(0))))
+              rebind_executor<executor_type>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code, typename Protocol::socket::template
@@ -1723,10 +1703,10 @@ public:
   template <typename Executor1>
   typename Protocol::socket::template rebind_executor<Executor1>::other
   accept(const Executor1& ex,
-      typename constraint<
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
+      > = 0)
   {
     boost::system::error_code ec;
     typename Protocol::socket::template
@@ -1763,9 +1743,9 @@ public:
   typename Protocol::socket::template rebind_executor<
       typename ExecutionContext::executor_type>::other
   accept(ExecutionContext& context,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
   {
     boost::system::error_code ec;
     typename Protocol::socket::template rebind_executor<
@@ -1806,10 +1786,10 @@ public:
   template <typename Executor1>
   typename Protocol::socket::template rebind_executor<Executor1>::other
   accept(const Executor1& ex, boost::system::error_code& ec,
-      typename constraint<
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
+      > = 0)
   {
     typename Protocol::socket::template
       rebind_executor<Executor1>::other peer(ex);
@@ -1849,9 +1829,9 @@ public:
   typename Protocol::socket::template rebind_executor<
       typename ExecutionContext::executor_type>::other
   accept(ExecutionContext& context, boost::system::error_code& ec,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
   {
     typename Protocol::socket::template rebind_executor<
         typename ExecutionContext::executor_type>::other peer(context);
@@ -1925,22 +1905,17 @@ public:
   template <typename Executor1,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
-          typename constraint<is_executor<Executor1>::value
+          constraint_t<is_executor<Executor1>::value
             || execution::is_executor<Executor1>::value,
-              Executor1>::type>::other)) MoveAcceptToken
-                BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template rebind_executor<
-          Executor1>::other))
-  async_accept(const Executor1& ex,
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type),
-      typename constraint<
+              Executor1>>::other)) MoveAcceptToken
+                = default_completion_token_t<executor_type>>
+  auto async_accept(const Executor1& ex,
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>(),
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      > = 0)
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code,
           typename Protocol::socket::template rebind_executor<
@@ -1948,7 +1923,7 @@ public:
               declval<initiate_async_move_accept>(), token,
               ex, static_cast<endpoint_type*>(0),
               static_cast<typename Protocol::socket::template
-                rebind_executor<Executor1>::other*>(0))))
+                rebind_executor<Executor1>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code,
@@ -2027,18 +2002,13 @@ public:
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
           typename ExecutionContext::executor_type>::other)) MoveAcceptToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template rebind_executor<
-          typename ExecutionContext::executor_type>::other))
-  async_accept(ExecutionContext& context,
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type),
-      typename constraint<
+            = default_completion_token_t<executor_type>>
+  auto async_accept(ExecutionContext& context,
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>(),
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      > = 0)
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code,
           typename Protocol::socket::template rebind_executor<
@@ -2046,7 +2016,7 @@ public:
               declval<initiate_async_move_accept>(), token,
               context.get_executor(), static_cast<endpoint_type*>(0),
               static_cast<typename Protocol::socket::template rebind_executor<
-                typename ExecutionContext::executor_type>::other*>(0))))
+                typename ExecutionContext::executor_type>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code,
@@ -2203,22 +2173,17 @@ public:
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
           executor_type>::other)) MoveAcceptToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template
-          rebind_executor<executor_type>::other))
-  async_accept(endpoint_type& peer_endpoint,
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type))
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+            = default_completion_token_t<executor_type>>
+  auto async_accept(endpoint_type& peer_endpoint,
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>())
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code, typename Protocol::socket::template
           rebind_executor<executor_type>::other)>(
             declval<initiate_async_move_accept>(), token,
-            declval<executor_type>(), &peer_endpoint,
+            declval<const executor_type&>(), &peer_endpoint,
             static_cast<typename Protocol::socket::template
-              rebind_executor<executor_type>::other*>(0))))
+              rebind_executor<executor_type>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code, typename Protocol::socket::template
@@ -2260,10 +2225,10 @@ public:
   template <typename Executor1>
   typename Protocol::socket::template rebind_executor<Executor1>::other
   accept(const Executor1& ex, endpoint_type& peer_endpoint,
-      typename constraint<
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
+      > = 0)
   {
     boost::system::error_code ec;
     typename Protocol::socket::template
@@ -2306,9 +2271,9 @@ public:
   typename Protocol::socket::template rebind_executor<
       typename ExecutionContext::executor_type>::other
   accept(ExecutionContext& context, endpoint_type& peer_endpoint,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
   {
     boost::system::error_code ec;
     typename Protocol::socket::template rebind_executor<
@@ -2356,10 +2321,10 @@ public:
   typename Protocol::socket::template rebind_executor<Executor1>::other
   accept(const executor_type& ex,
       endpoint_type& peer_endpoint, boost::system::error_code& ec,
-      typename constraint<
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
+      > = 0)
   {
     typename Protocol::socket::template
       rebind_executor<Executor1>::other peer(ex);
@@ -2406,9 +2371,9 @@ public:
       typename ExecutionContext::executor_type>::other
   accept(ExecutionContext& context,
       endpoint_type& peer_endpoint, boost::system::error_code& ec,
-      typename constraint<
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
+      > = 0)
   {
     typename Protocol::socket::template rebind_executor<
         typename ExecutionContext::executor_type>::other peer(context);
@@ -2489,29 +2454,24 @@ public:
   template <typename Executor1,
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
-          typename constraint<is_executor<Executor1>::value
+          constraint_t<is_executor<Executor1>::value
             || execution::is_executor<Executor1>::value,
-              Executor1>::type>::other)) MoveAcceptToken
-                BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template rebind_executor<
-          Executor1>::other))
-  async_accept(const Executor1& ex, endpoint_type& peer_endpoint,
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type),
-      typename constraint<
+              Executor1>>::other)) MoveAcceptToken
+                = default_completion_token_t<executor_type>>
+  auto async_accept(const Executor1& ex, endpoint_type& peer_endpoint,
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>(),
+      constraint_t<
         is_executor<Executor1>::value
           || execution::is_executor<Executor1>::value
-      >::type = 0)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      > = 0)
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code,
           typename Protocol::socket::template rebind_executor<
             Executor1>::other)>(
           declval<initiate_async_move_accept>(), token, ex, &peer_endpoint,
           static_cast<typename Protocol::socket::template
-            rebind_executor<Executor1>::other*>(0))))
+            rebind_executor<Executor1>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code,
@@ -2595,19 +2555,13 @@ public:
       BOOST_ASIO_COMPLETION_TOKEN_FOR(void (boost::system::error_code,
         typename Protocol::socket::template rebind_executor<
           typename ExecutionContext::executor_type>::other)) MoveAcceptToken
-            BOOST_ASIO_DEFAULT_COMPLETION_TOKEN_TYPE(executor_type)>
-  BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_PREFIX(MoveAcceptToken,
-      void (boost::system::error_code,
-        typename Protocol::socket::template rebind_executor<
-          typename ExecutionContext::executor_type>::other))
-  async_accept(ExecutionContext& context,
-      endpoint_type& peer_endpoint,
-      BOOST_ASIO_MOVE_ARG(MoveAcceptToken) token
-        BOOST_ASIO_DEFAULT_COMPLETION_TOKEN(executor_type),
-      typename constraint<
+            = default_completion_token_t<executor_type>>
+  auto async_accept(ExecutionContext& context, endpoint_type& peer_endpoint,
+      MoveAcceptToken&& token = default_completion_token_t<executor_type>(),
+      constraint_t<
         is_convertible<ExecutionContext&, execution_context&>::value
-      >::type = 0)
-    BOOST_ASIO_INITFN_AUTO_RESULT_TYPE_SUFFIX((
+      > = 0)
+    -> decltype(
       async_initiate<MoveAcceptToken,
         void (boost::system::error_code,
           typename Protocol::socket::template rebind_executor<
@@ -2615,7 +2569,7 @@ public:
               declval<initiate_async_move_accept>(), token,
               context.get_executor(), &peer_endpoint,
               static_cast<typename Protocol::socket::template rebind_executor<
-                typename ExecutionContext::executor_type>::other*>(0))))
+                typename ExecutionContext::executor_type>::other*>(0)))
   {
     return async_initiate<MoveAcceptToken,
       void (boost::system::error_code,
@@ -2626,13 +2580,12 @@ public:
             static_cast<typename Protocol::socket::template rebind_executor<
               typename ExecutionContext::executor_type>::other*>(0));
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 
 private:
   // Disallow copying and assignment.
-  basic_socket_acceptor(const basic_socket_acceptor&) BOOST_ASIO_DELETED;
+  basic_socket_acceptor(const basic_socket_acceptor&) = delete;
   basic_socket_acceptor& operator=(
-      const basic_socket_acceptor&) BOOST_ASIO_DELETED;
+      const basic_socket_acceptor&) = delete;
 
   class initiate_async_wait
   {
@@ -2644,13 +2597,13 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename WaitHandler>
-    void operator()(BOOST_ASIO_MOVE_ARG(WaitHandler) handler, wait_type w) const
+    void operator()(WaitHandler&& handler, wait_type w) const
     {
       // If you get an error on the following line it means that your handler
       // does not meet the documented type requirements for a WaitHandler.
@@ -2676,13 +2629,13 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename AcceptHandler, typename Protocol1, typename Executor1>
-    void operator()(BOOST_ASIO_MOVE_ARG(AcceptHandler) handler,
+    void operator()(AcceptHandler&& handler,
         basic_socket<Protocol1, Executor1>* peer,
         endpoint_type* peer_endpoint) const
     {
@@ -2710,13 +2663,13 @@ private:
     {
     }
 
-    const executor_type& get_executor() const BOOST_ASIO_NOEXCEPT
+    const executor_type& get_executor() const noexcept
     {
       return self_->get_executor();
     }
 
     template <typename MoveAcceptHandler, typename Executor1, typename Socket>
-    void operator()(BOOST_ASIO_MOVE_ARG(MoveAcceptHandler) handler,
+    void operator()(MoveAcceptHandler&& handler,
         const Executor1& peer_ex, endpoint_type* peer_endpoint, Socket*) const
     {
       // If you get an error on the following line it means that your handler