passenger 6.0.20 → 6.0.21

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

@@ -2,7 +2,7 @@
 // detail/bind_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)
@@ -17,9 +17,7 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/associator.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/push_options.hpp>
@@ -33,31 +31,29 @@ class binder0
 {
 public:
   template <typename T>
-  binder0(int, BOOST_ASIO_MOVE_ARG(T) handler)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler))
+  binder0(int, T&& handler)
+    : handler_(static_cast<T&&>(handler))
   {
   }
 
   binder0(Handler& handler)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler))
+    : handler_(static_cast<Handler&&>(handler))
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder0(const binder0& other)
     : handler_(other.handler_)
   {
   }
 
   binder0(binder0&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_))
+    : handler_(static_cast<Handler&&>(other.handler_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)();
+    static_cast<Handler&&>(handler_)();
   }
 
   void operator()() const
@@ -69,32 +65,6 @@ public:
   Handler handler_;
 };
 
-template <typename Handler>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder0<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,
-    binder0<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(
     binder0<Handler>* this_handler)
@@ -103,36 +73,12 @@ 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,
-    binder0<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,
-    binder0<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 Handler>
-inline binder0<typename decay<Handler>::type> bind_handler(
-    BOOST_ASIO_MOVE_ARG(Handler) handler)
+inline binder0<decay_t<Handler>> bind_handler(
+    Handler&& handler)
 {
-  return binder0<typename decay<Handler>::type>(
-      0, BOOST_ASIO_MOVE_CAST(Handler)(handler));
+  return binder0<decay_t<Handler>>(
+      0, static_cast<Handler&&>(handler));
 }
 
 template <typename Handler, typename Arg1>
@@ -140,19 +86,18 @@ class binder1
 {
 public:
   template <typename T>
-  binder1(int, BOOST_ASIO_MOVE_ARG(T) handler, const Arg1& arg1)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler)),
+  binder1(int, T&& handler, const Arg1& arg1)
+    : handler_(static_cast<T&&>(handler)),
       arg1_(arg1)
   {
   }
 
   binder1(Handler& handler, const Arg1& arg1)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1)
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder1(const binder1& other)
     : handler_(other.handler_),
       arg1_(other.arg1_)
@@ -160,15 +105,14 @@ public:
   }
 
   binder1(binder1&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_));
   }
 
@@ -182,32 +126,6 @@ public:
   Arg1 arg1_;
 };
 
-template <typename Handler, typename Arg1>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder1<Handler, Arg1>* 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, typename Arg1>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    binder1<Handler, Arg1>* 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, typename Arg1>
 inline bool asio_handler_is_continuation(
     binder1<Handler, Arg1>* this_handler)
@@ -216,36 +134,12 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    binder1<Handler, Arg1>* 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, typename Arg1>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    binder1<Handler, Arg1>* 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 Handler, typename Arg1>
-inline binder1<typename decay<Handler>::type, Arg1> bind_handler(
-    BOOST_ASIO_MOVE_ARG(Handler) handler, const Arg1& arg1)
+inline binder1<decay_t<Handler>, Arg1> bind_handler(
+    Handler&& handler, const Arg1& arg1)
 {
-  return binder1<typename decay<Handler>::type, Arg1>(0,
-      BOOST_ASIO_MOVE_CAST(Handler)(handler), arg1);
+  return binder1<decay_t<Handler>, Arg1>(0,
+      static_cast<Handler&&>(handler), arg1);
 }
 
 template <typename Handler, typename Arg1, typename Arg2>
@@ -253,22 +147,21 @@ class binder2
 {
 public:
   template <typename T>
-  binder2(int, BOOST_ASIO_MOVE_ARG(T) handler,
+  binder2(int, T&& handler,
       const Arg1& arg1, const Arg2& arg2)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler)),
+    : handler_(static_cast<T&&>(handler)),
       arg1_(arg1),
       arg2_(arg2)
   {
   }
 
   binder2(Handler& handler, const Arg1& arg1, const Arg2& arg2)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1),
       arg2_(arg2)
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder2(const binder2& other)
     : handler_(other.handler_),
       arg1_(other.arg1_),
@@ -277,16 +170,15 @@ public:
   }
 
   binder2(binder2&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_)),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(other.arg2_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_)),
+      arg2_(static_cast<Arg2&&>(other.arg2_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_),
         static_cast<const Arg2&>(arg2_));
   }
@@ -302,32 +194,6 @@ public:
   Arg2 arg2_;
 };
 
-template <typename Handler, typename Arg1, typename Arg2>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder2<Handler, Arg1, Arg2>* 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, typename Arg1, typename Arg2>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    binder2<Handler, Arg1, Arg2>* 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, typename Arg1, typename Arg2>
 inline bool asio_handler_is_continuation(
     binder2<Handler, Arg1, Arg2>* this_handler)
@@ -336,36 +202,12 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1, typename Arg2>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    binder2<Handler, Arg1, Arg2>* 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, typename Arg1, typename Arg2>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    binder2<Handler, Arg1, Arg2>* 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 Handler, typename Arg1, typename Arg2>
-inline binder2<typename decay<Handler>::type, Arg1, Arg2> bind_handler(
-    BOOST_ASIO_MOVE_ARG(Handler) handler, const Arg1& arg1, const Arg2& arg2)
+inline binder2<decay_t<Handler>, Arg1, Arg2> bind_handler(
+    Handler&& handler, const Arg1& arg1, const Arg2& arg2)
 {
-  return binder2<typename decay<Handler>::type, Arg1, Arg2>(0,
-      BOOST_ASIO_MOVE_CAST(Handler)(handler), arg1, arg2);
+  return binder2<decay_t<Handler>, Arg1, Arg2>(0,
+      static_cast<Handler&&>(handler), arg1, arg2);
 }
 
 template <typename Handler, typename Arg1, typename Arg2, typename Arg3>
@@ -373,9 +215,9 @@ class binder3
 {
 public:
   template <typename T>
-  binder3(int, BOOST_ASIO_MOVE_ARG(T) handler, const Arg1& arg1,
+  binder3(int, T&& handler, const Arg1& arg1,
       const Arg2& arg2, const Arg3& arg3)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler)),
+    : handler_(static_cast<T&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3)
@@ -384,14 +226,13 @@ public:
 
   binder3(Handler& handler, const Arg1& arg1,
       const Arg2& arg2, const Arg3& arg3)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3)
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder3(const binder3& other)
     : handler_(other.handler_),
       arg1_(other.arg1_),
@@ -401,17 +242,16 @@ public:
   }
 
   binder3(binder3&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_)),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(other.arg2_)),
-      arg3_(BOOST_ASIO_MOVE_CAST(Arg3)(other.arg3_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_)),
+      arg2_(static_cast<Arg2&&>(other.arg2_)),
+      arg3_(static_cast<Arg3&&>(other.arg3_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_),
         static_cast<const Arg2&>(arg2_),
         static_cast<const Arg3&>(arg3_));
@@ -429,32 +269,6 @@ public:
   Arg3 arg3_;
 };
 
-template <typename Handler, typename Arg1, typename Arg2, typename Arg3>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder3<Handler, Arg1, Arg2, Arg3>* 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, typename Arg1, typename Arg2, typename Arg3>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    binder3<Handler, Arg1, Arg2, Arg3>* 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, typename Arg1, typename Arg2, typename Arg3>
 inline bool asio_handler_is_continuation(
     binder3<Handler, Arg1, Arg2, Arg3>* this_handler)
@@ -463,39 +277,13 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler,
-    typename Arg1, typename Arg2, typename Arg3>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    binder3<Handler, Arg1, Arg2, Arg3>* 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,
-    typename Arg1, typename Arg2, typename Arg3>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    binder3<Handler, Arg1, Arg2, Arg3>* 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 Handler, typename Arg1, typename Arg2, typename Arg3>
-inline binder3<typename decay<Handler>::type, Arg1, Arg2, Arg3> bind_handler(
-    BOOST_ASIO_MOVE_ARG(Handler) handler, const Arg1& arg1, const Arg2& arg2,
+inline binder3<decay_t<Handler>, Arg1, Arg2, Arg3> bind_handler(
+    Handler&& handler, const Arg1& arg1, const Arg2& arg2,
     const Arg3& arg3)
 {
-  return binder3<typename decay<Handler>::type, Arg1, Arg2, Arg3>(0,
-      BOOST_ASIO_MOVE_CAST(Handler)(handler), arg1, arg2, arg3);
+  return binder3<decay_t<Handler>, Arg1, Arg2, Arg3>(0,
+      static_cast<Handler&&>(handler), arg1, arg2, arg3);
 }
 
 template <typename Handler, typename Arg1,
@@ -504,9 +292,9 @@ class binder4
 {
 public:
   template <typename T>
-  binder4(int, BOOST_ASIO_MOVE_ARG(T) handler, const Arg1& arg1,
+  binder4(int, T&& handler, const Arg1& arg1,
       const Arg2& arg2, const Arg3& arg3, const Arg4& arg4)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler)),
+    : handler_(static_cast<T&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3),
@@ -516,7 +304,7 @@ public:
 
   binder4(Handler& handler, const Arg1& arg1,
       const Arg2& arg2, const Arg3& arg3, const Arg4& arg4)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3),
@@ -524,7 +312,6 @@ public:
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder4(const binder4& other)
     : handler_(other.handler_),
       arg1_(other.arg1_),
@@ -535,18 +322,17 @@ public:
   }
 
   binder4(binder4&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_)),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(other.arg2_)),
-      arg3_(BOOST_ASIO_MOVE_CAST(Arg3)(other.arg3_)),
-      arg4_(BOOST_ASIO_MOVE_CAST(Arg4)(other.arg4_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_)),
+      arg2_(static_cast<Arg2&&>(other.arg2_)),
+      arg3_(static_cast<Arg3&&>(other.arg3_)),
+      arg4_(static_cast<Arg4&&>(other.arg4_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_),
         static_cast<const Arg2&>(arg2_),
         static_cast<const Arg3&>(arg3_),
@@ -566,34 +352,6 @@ public:
   Arg4 arg4_;
 };
 
-template <typename Handler, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder4<Handler, Arg1, Arg2, Arg3, Arg4>* 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, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    binder4<Handler, Arg1, Arg2, Arg3, Arg4>* 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, typename Arg1,
     typename Arg2, typename Arg3, typename Arg4>
 inline bool asio_handler_is_continuation(
@@ -603,40 +361,14 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    binder4<Handler, Arg1, Arg2, Arg3, Arg4>* 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, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    binder4<Handler, Arg1, Arg2, Arg3, Arg4>* 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 Handler, typename Arg1,
     typename Arg2, typename Arg3, typename Arg4>
-inline binder4<typename decay<Handler>::type, Arg1, Arg2, Arg3, Arg4>
-bind_handler(BOOST_ASIO_MOVE_ARG(Handler) handler, const Arg1& arg1,
+inline binder4<decay_t<Handler>, Arg1, Arg2, Arg3, Arg4>
+bind_handler(Handler&& handler, const Arg1& arg1,
     const Arg2& arg2, const Arg3& arg3, const Arg4& arg4)
 {
-  return binder4<typename decay<Handler>::type, Arg1, Arg2, Arg3, Arg4>(0,
-      BOOST_ASIO_MOVE_CAST(Handler)(handler), arg1, arg2, arg3, arg4);
+  return binder4<decay_t<Handler>, Arg1, Arg2, Arg3, Arg4>(0,
+      static_cast<Handler&&>(handler), arg1, arg2, arg3, arg4);
 }
 
 template <typename Handler, typename Arg1, typename Arg2,
@@ -645,9 +377,9 @@ class binder5
 {
 public:
   template <typename T>
-  binder5(int, BOOST_ASIO_MOVE_ARG(T) handler, const Arg1& arg1,
+  binder5(int, T&& handler, const Arg1& arg1,
       const Arg2& arg2, const Arg3& arg3, const Arg4& arg4, const Arg5& arg5)
-    : handler_(BOOST_ASIO_MOVE_CAST(T)(handler)),
+    : handler_(static_cast<T&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3),
@@ -658,7 +390,7 @@ public:
 
   binder5(Handler& handler, const Arg1& arg1, const Arg2& arg2,
       const Arg3& arg3, const Arg4& arg4, const Arg5& arg5)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1),
       arg2_(arg2),
       arg3_(arg3),
@@ -667,7 +399,6 @@ public:
   {
   }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
   binder5(const binder5& other)
     : handler_(other.handler_),
       arg1_(other.arg1_),
@@ -679,19 +410,18 @@ public:
   }
 
   binder5(binder5&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_)),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(other.arg2_)),
-      arg3_(BOOST_ASIO_MOVE_CAST(Arg3)(other.arg3_)),
-      arg4_(BOOST_ASIO_MOVE_CAST(Arg4)(other.arg4_)),
-      arg5_(BOOST_ASIO_MOVE_CAST(Arg5)(other.arg5_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_)),
+      arg2_(static_cast<Arg2&&>(other.arg2_)),
+      arg3_(static_cast<Arg3&&>(other.arg3_)),
+      arg4_(static_cast<Arg4&&>(other.arg4_)),
+      arg5_(static_cast<Arg5&&>(other.arg5_))
   {
   }
-#endif // defined(BOOST_ASIO_HAS_MOVE)
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_),
         static_cast<const Arg2&>(arg2_),
         static_cast<const Arg3&>(arg3_),
@@ -713,34 +443,6 @@ public:
   Arg5 arg5_;
 };
 
-template <typename Handler, typename Arg1, typename Arg2,
-    typename Arg3, typename Arg4, typename Arg5>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* 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, typename Arg1, typename Arg2,
-    typename Arg3, typename Arg4, typename Arg5>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* 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, typename Arg1, typename Arg2,
     typename Arg3, typename Arg4, typename Arg5>
 inline bool asio_handler_is_continuation(
@@ -750,65 +452,37 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4, typename Arg5>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(Function& function,
-    binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* 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, typename Arg1,
-    typename Arg2, typename Arg3, typename Arg4, typename Arg5>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(const Function& function,
-    binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>* 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 Handler, typename Arg1, typename Arg2,
     typename Arg3, typename Arg4, typename Arg5>
-inline binder5<typename decay<Handler>::type, Arg1, Arg2, Arg3, Arg4, Arg5>
-bind_handler(BOOST_ASIO_MOVE_ARG(Handler) handler, const Arg1& arg1,
+inline binder5<decay_t<Handler>, Arg1, Arg2, Arg3, Arg4, Arg5>
+bind_handler(Handler&& handler, const Arg1& arg1,
     const Arg2& arg2, const Arg3& arg3, const Arg4& arg4, const Arg5& arg5)
 {
-  return binder5<typename decay<Handler>::type, Arg1, Arg2, Arg3, Arg4, Arg5>(0,
-      BOOST_ASIO_MOVE_CAST(Handler)(handler), arg1, arg2, arg3, arg4, arg5);
+  return binder5<decay_t<Handler>, Arg1, Arg2, Arg3, Arg4, Arg5>(0,
+      static_cast<Handler&&>(handler), arg1, arg2, arg3, arg4, arg5);
 }
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-
 template <typename Handler, typename Arg1>
 class move_binder1
 {
 public:
-  move_binder1(int, BOOST_ASIO_MOVE_ARG(Handler) handler,
-      BOOST_ASIO_MOVE_ARG(Arg1) arg1)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(arg1))
+  move_binder1(int, Handler&& handler,
+      Arg1&& arg1)
+    : handler_(static_cast<Handler&&>(handler)),
+      arg1_(static_cast<Arg1&&>(arg1))
   {
   }
 
   move_binder1(move_binder1&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_))
   {
   }
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
-        BOOST_ASIO_MOVE_CAST(Arg1)(arg1_));
+    static_cast<Handler&&>(handler_)(
+        static_cast<Arg1&&>(arg1_));
   }
 
 //private:
@@ -816,32 +490,6 @@ public:
   Arg1 arg1_;
 };
 
-template <typename Handler, typename Arg1>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    move_binder1<Handler, Arg1>* 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, typename Arg1>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    move_binder1<Handler, Arg1>* 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, typename Arg1>
 inline bool asio_handler_is_continuation(
     move_binder1<Handler, Arg1>* this_handler)
@@ -850,42 +498,30 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(BOOST_ASIO_MOVE_ARG(Function) function,
-    move_binder1<Handler, Arg1>* this_handler)
-{
-  boost_asio_handler_invoke_helpers::invoke(
-      BOOST_ASIO_MOVE_CAST(Function)(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 Handler, typename Arg1, typename Arg2>
 class move_binder2
 {
 public:
-  move_binder2(int, BOOST_ASIO_MOVE_ARG(Handler) handler,
-      const Arg1& arg1, BOOST_ASIO_MOVE_ARG(Arg2) arg2)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(handler)),
+  move_binder2(int, Handler&& handler,
+      const Arg1& arg1, Arg2&& arg2)
+    : handler_(static_cast<Handler&&>(handler)),
       arg1_(arg1),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(arg2))
+      arg2_(static_cast<Arg2&&>(arg2))
   {
   }
 
   move_binder2(move_binder2&& other)
-    : handler_(BOOST_ASIO_MOVE_CAST(Handler)(other.handler_)),
-      arg1_(BOOST_ASIO_MOVE_CAST(Arg1)(other.arg1_)),
-      arg2_(BOOST_ASIO_MOVE_CAST(Arg2)(other.arg2_))
+    : handler_(static_cast<Handler&&>(other.handler_)),
+      arg1_(static_cast<Arg1&&>(other.arg1_)),
+      arg2_(static_cast<Arg2&&>(other.arg2_))
   {
   }
 
   void operator()()
   {
-    BOOST_ASIO_MOVE_OR_LVALUE(Handler)(handler_)(
+    static_cast<Handler&&>(handler_)(
         static_cast<const Arg1&>(arg1_),
-        BOOST_ASIO_MOVE_CAST(Arg2)(arg2_));
+        static_cast<Arg2&&>(arg2_));
   }
 
 //private:
@@ -894,32 +530,6 @@ public:
   Arg2 arg2_;
 };
 
-template <typename Handler, typename Arg1, typename Arg2>
-inline asio_handler_allocate_is_deprecated
-asio_handler_allocate(std::size_t size,
-    move_binder2<Handler, Arg1, Arg2>* 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, typename Arg1, typename Arg2>
-inline asio_handler_deallocate_is_deprecated
-asio_handler_deallocate(void* pointer, std::size_t size,
-    move_binder2<Handler, Arg1, Arg2>* 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, typename Arg1, typename Arg2>
 inline bool asio_handler_is_continuation(
     move_binder2<Handler, Arg1, Arg2>* this_handler)
@@ -928,20 +538,6 @@ inline bool asio_handler_is_continuation(
       this_handler->handler_);
 }
 
-template <typename Function, typename Handler, typename Arg1, typename Arg2>
-inline asio_handler_invoke_is_deprecated
-asio_handler_invoke(BOOST_ASIO_MOVE_ARG(Function) function,
-    move_binder2<Handler, Arg1, Arg2>* this_handler)
-{
-  boost_asio_handler_invoke_helpers::invoke(
-      BOOST_ASIO_MOVE_CAST(Function)(function), this_handler->handler_);
-#if defined(BOOST_ASIO_NO_DEPRECATED)
-  return asio_handler_invoke_is_no_longer_used();
-#endif // defined(BOOST_ASIO_NO_DEPRECATED)
-}
-
-#endif // defined(BOOST_ASIO_HAS_MOVE)
-
 } // namespace detail
 
 template <template <typename, typename> class Associator,
@@ -950,18 +546,15 @@ struct associator<Associator,
     detail::binder0<Handler>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder0<Handler>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder0<Handler>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder0<Handler>& 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::binder0<Handler>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -973,18 +566,15 @@ struct associator<Associator,
     detail::binder1<Handler, Arg1>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder1<Handler, Arg1>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder1<Handler, Arg1>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder1<Handler, Arg1>& 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::binder1<Handler, Arg1>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -997,18 +587,15 @@ struct associator<Associator,
     detail::binder2<Handler, Arg1, Arg2>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder2<Handler, Arg1, Arg2>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder2<Handler, Arg1, Arg2>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder2<Handler, Arg1, Arg2>& 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::binder2<Handler, Arg1, Arg2>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -1021,18 +608,15 @@ struct associator<Associator,
     detail::binder3<Handler, Arg1, Arg2, Arg3>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder3<Handler, Arg1, Arg2, Arg3>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder3<Handler, Arg1, Arg2, Arg3>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder3<Handler, Arg1, Arg2, Arg3>& 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::binder3<Handler, Arg1, Arg2, Arg3>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -1045,19 +629,15 @@ struct associator<Associator,
     detail::binder4<Handler, Arg1, Arg2, Arg3, Arg4>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder4<Handler, Arg1, Arg2, Arg3, Arg4>& h)
-    BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder4<Handler, Arg1, Arg2, Arg3, Arg4>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder4<Handler, Arg1, Arg2, Arg3, Arg4>& 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::binder4<Handler, Arg1, Arg2, Arg3, Arg4>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
@@ -1070,75 +650,61 @@ struct associator<Associator,
     detail::binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>& h)
-    BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>& 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::binder5<Handler, Arg1, Arg2, Arg3, Arg4, Arg5>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
 };
 
-#if defined(BOOST_ASIO_HAS_MOVE)
-
 template <template <typename, typename> class Associator,
     typename Handler, typename Arg1, typename DefaultCandidate>
 struct associator<Associator,
     detail::move_binder1<Handler, Arg1>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::move_binder1<Handler, Arg1>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::move_binder1<Handler, Arg1>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::move_binder1<Handler, Arg1>& 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::move_binder1<Handler, Arg1>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
 };
 
 template <template <typename, typename> class Associator,
-    typename Handler, typename Arg1, typename Arg2,
-    typename DefaultCandidate>
+    typename Handler, typename Arg1, typename Arg2, typename DefaultCandidate>
 struct associator<Associator,
     detail::move_binder2<Handler, Arg1, Arg2>, DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
-  static typename Associator<Handler, DefaultCandidate>::type
-  get(const detail::move_binder2<Handler, Arg1, Arg2>& h) BOOST_ASIO_NOEXCEPT
+  static typename Associator<Handler, DefaultCandidate>::type get(
+      const detail::move_binder2<Handler, Arg1, Arg2>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
-  static BOOST_ASIO_AUTO_RETURN_TYPE_PREFIX2(
-      typename Associator<Handler, DefaultCandidate>::type)
-  get(const detail::move_binder2<Handler, Arg1, Arg2>& 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::move_binder2<Handler, Arg1, Arg2>& h,
+      const DefaultCandidate& c) noexcept
+    -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_, c);
   }
 };
 
-#endif // defined(BOOST_ASIO_HAS_MOVE)
-
 } // namespace asio
 } // namespace boost