passenger 6.0.23 → 6.0.25

data/src/cxx_supportlib/vendor-modified/boost/asio/{experimental/detail/channel_message.hpp → detail/completion_message.hpp}

@@ -1,6 +1,6 @@
 //
-// experimental/detail/channel_message.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/completion_message.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
@@ -8,8 +8,8 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_MESSAGE_HPP
-#define BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_MESSAGE_HPP
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
@@ -24,17 +24,16 @@
 
 namespace boost {
 namespace asio {
-namespace experimental {
 namespace detail {
 
 template <typename Signature>
-class channel_message;
+class completion_message;
 
 template <typename R>
-class channel_message<R()>
+class completion_message<R()>
 {
 public:
-  channel_message(int)
+  completion_message(int)
   {
   }
 
@@ -46,11 +45,11 @@ public:
 };
 
 template <typename R, typename Arg0>
-class channel_message<R(Arg0)>
+class completion_message<R(Arg0)>
 {
 public:
   template <typename T0>
-  channel_message(int, T0&& t0)
+  completion_message(int, T0&& t0)
     : arg0_(static_cast<T0&&>(t0))
   {
   }
@@ -68,11 +67,11 @@ private:
 };
 
 template <typename R, typename Arg0, typename Arg1>
-class channel_message<R(Arg0, Arg1)>
+class completion_message<R(Arg0, Arg1)>
 {
 public:
   template <typename T0, typename T1>
-  channel_message(int, T0&& t0, T1&& t1)
+  completion_message(int, T0&& t0, T1&& t1)
     : arg0_(static_cast<T0&&>(t0)),
       arg1_(static_cast<T1&&>(t1))
   {
@@ -94,11 +93,11 @@ private:
 };
 
 template <typename R, typename... Args>
-class channel_message<R(Args...)>
+class completion_message<R(Args...)>
 {
 public:
   template <typename... T>
-  channel_message(int, T&&... t)
+  completion_message(int, T&&... t)
     : args_(static_cast<T&&>(t)...)
   {
   }
@@ -122,10 +121,9 @@ private:
 };
 
 } // namespace detail
-} // namespace experimental
 } // namespace asio
 } // namespace boost
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_MESSAGE_HPP
+#endif // BOOST_ASIO_DETAIL_COMPLETION_MESSAGE_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/{experimental/detail/channel_payload.hpp → detail/completion_payload.hpp}

@@ -1,6 +1,6 @@
 //
-// experimental/detail/channel_payload.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/completion_payload.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
@@ -8,8 +8,8 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_PAYLOAD_HPP
-#define BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_PAYLOAD_HPP
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
@@ -18,7 +18,7 @@
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/system/error_code.hpp>
-#include <boost/asio/experimental/detail/channel_message.hpp>
+#include <boost/asio/detail/completion_message.hpp>
 
 #if defined(BOOST_ASIO_HAS_STD_VARIANT)
 # include <variant>
@@ -30,17 +30,16 @@
 
 namespace boost {
 namespace asio {
-namespace experimental {
 namespace detail {
 
 template <typename... Signatures>
-class channel_payload;
+class completion_payload;
 
 template <typename R>
-class channel_payload<R()>
+class completion_payload<R()>
 {
 public:
-  explicit channel_payload(channel_message<R()>)
+  explicit completion_payload(completion_message<R()>)
   {
   }
 
@@ -52,11 +51,11 @@ public:
 };
 
 template <typename Signature>
-class channel_payload<Signature>
+class completion_payload<Signature>
 {
 public:
-  channel_payload(channel_message<Signature>&& m)
-    : message_(static_cast<channel_message<Signature>&&>(m))
+  completion_payload(completion_message<Signature>&& m)
+    : message_(static_cast<completion_message<Signature>&&>(m))
   {
   }
 
@@ -67,18 +66,18 @@ public:
   }
 
 private:
-  channel_message<Signature> message_;
+  completion_message<Signature> message_;
 };
 
 #if defined(BOOST_ASIO_HAS_STD_VARIANT)
 
 template <typename... Signatures>
-class channel_payload
+class completion_payload
 {
 public:
   template <typename Signature>
-  channel_payload(channel_message<Signature>&& m)
-    : message_(static_cast<channel_message<Signature>&&>(m))
+  completion_payload(completion_message<Signature>&& m)
+    : message_(static_cast<completion_message<Signature>&&>(m))
   {
   }
 
@@ -93,25 +92,25 @@ public:
   }
 
 private:
-  std::variant<channel_message<Signatures>...> message_;
+  std::variant<completion_message<Signatures>...> message_;
 };
 
 #else // defined(BOOST_ASIO_HAS_STD_VARIANT)
 
 template <typename R1, typename R2>
-class channel_payload<R1(), R2(boost::system::error_code)>
+class completion_payload<R1(), R2(boost::system::error_code)>
 {
 public:
-  typedef channel_message<R1()> void_message_type;
-  typedef channel_message<R2(boost::system::error_code)> error_message_type;
+  typedef completion_message<R1()> void_message_type;
+  typedef completion_message<R2(boost::system::error_code)> error_message_type;
 
-  channel_payload(void_message_type&&)
+  completion_payload(void_message_type&&)
     : message_(0, boost::system::error_code()),
       empty_(true)
   {
   }
 
-  channel_payload(error_message_type&& m)
+  completion_payload(error_message_type&& m)
     : message_(static_cast<error_message_type&&>(m)),
       empty_(false)
   {
@@ -121,7 +120,7 @@ public:
   void receive(Handler& handler)
   {
     if (empty_)
-      channel_message<R1()>(0).receive(handler);
+      completion_message<R1()>(0).receive(handler);
     else
       message_.receive(handler);
   }
@@ -132,25 +131,25 @@ private:
 };
 
 template <typename Sig1, typename Sig2>
-class channel_payload<Sig1, Sig2>
+class completion_payload<Sig1, Sig2>
 {
 public:
-  typedef channel_message<Sig1> message_1_type;
-  typedef channel_message<Sig2> message_2_type;
+  typedef completion_message<Sig1> message_1_type;
+  typedef completion_message<Sig2> message_2_type;
 
-  channel_payload(message_1_type&& m)
+  completion_payload(message_1_type&& m)
     : index_(1)
   {
     new (&storage_.message_1_) message_1_type(static_cast<message_1_type&&>(m));
   }
 
-  channel_payload(message_2_type&& m)
+  completion_payload(message_2_type&& m)
     : index_(2)
   {
     new (&storage_.message_2_) message_2_type(static_cast<message_2_type&&>(m));
   }
 
-  channel_payload(channel_payload&& other)
+  completion_payload(completion_payload&& other)
     : index_(other.index_)
   {
     switch (index_)
@@ -168,7 +167,7 @@ public:
     }
   }
 
-  ~channel_payload()
+  ~completion_payload()
   {
     switch (index_)
     {
@@ -215,10 +214,9 @@ private:
 #endif // defined(BOOST_ASIO_HAS_STD_VARIANT)
 
 } // namespace detail
-} // namespace experimental
 } // namespace asio
 } // namespace boost
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_PAYLOAD_HPP
+#endif // BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HPP

data/src/cxx_supportlib/vendor-modified/boost/asio/{experimental/detail/channel_handler.hpp → detail/completion_payload_handler.hpp}

@@ -1,6 +1,6 @@
 //
-// experimental/detail/channel_handler.hpp
-// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+// detail/completion_payload_handler.hpp
+// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2003-2024 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
@@ -8,8 +8,8 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_HANDLER_HPP
-#define BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_HANDLER_HPP
+#ifndef BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP
+#define BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
 # pragma once
@@ -17,20 +17,18 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/associator.hpp>
-#include <boost/asio/experimental/detail/channel_payload.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
 namespace boost {
 namespace asio {
-namespace experimental {
 namespace detail {
 
 template <typename Payload, typename Handler>
-class channel_handler
+class completion_payload_handler
 {
 public:
-  channel_handler(Payload&& p, Handler& h)
+  completion_payload_handler(Payload&& p, Handler& h)
     : payload_(static_cast<Payload&&>(p)),
       handler_(static_cast<Handler&&>(h))
   {
@@ -41,29 +39,33 @@ public:
     payload_.receive(handler_);
   }
 
+  Handler& handler()
+  {
+    return handler_;
+  }
+
 //private:
   Payload payload_;
   Handler handler_;
 };
 
 } // namespace detail
-} // namespace experimental
 
 template <template <typename, typename> class Associator,
     typename Payload, typename Handler, typename DefaultCandidate>
 struct associator<Associator,
-    experimental::detail::channel_handler<Payload, Handler>,
+    detail::completion_payload_handler<Payload, Handler>,
     DefaultCandidate>
   : Associator<Handler, DefaultCandidate>
 {
   static typename Associator<Handler, DefaultCandidate>::type get(
-      const experimental::detail::channel_handler<Payload, Handler>& h) noexcept
+      const detail::completion_payload_handler<Payload, Handler>& h) noexcept
   {
     return Associator<Handler, DefaultCandidate>::get(h.handler_);
   }
 
   static auto get(
-      const experimental::detail::channel_handler<Payload, Handler>& h,
+      const detail::completion_payload_handler<Payload, Handler>& h,
       const DefaultCandidate& c) noexcept
     -> decltype(Associator<Handler, DefaultCandidate>::get(h.handler_, c))
   {
@@ -76,4 +78,4 @@ struct associator<Associator,
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#endif // BOOST_ASIO_EXPERIMENTAL_DETAIL_CHANNEL_HANDLER_HPP
+#endif // BOOST_ASIO_DETAIL_COMPLETION_PAYLOAD_HANDLER_HPP

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

@@ -127,29 +127,7 @@
 # define BOOST_ASIO_HAS_USER_DEFINED_LITERALS 1
 # define BOOST_ASIO_HAS_ALIGNOF 1
 # define BOOST_ASIO_ALIGNOF(T) alignof(T)
-// Standard library support for std::align.
-#if !defined(BOOST_ASIO_HAS_STD_ALIGN)
-# if !defined(BOOST_ASIO_DISABLE_STD_ALIGN)
-#  if defined(__clang__)
-#   if defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
-#    define BOOST_ASIO_HAS_STD_ALIGN 1
-#   elif (__cplusplus >= 201103)
-#    define BOOST_ASIO_HAS_STD_ALIGN 1
-#   endif // (__cplusplus >= 201103)
-#  elif defined(__GNUC__)
-#   if (__GNUC__ >= 6)
-#    if (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#     define BOOST_ASIO_HAS_STD_ALIGN 1
-#    endif // (__cplusplus >= 201103) || defined(__GXX_EXPERIMENTAL_CXX0X__)
-#   endif // (__GNUC__ >= 6)
-#  endif // defined(__GNUC__)
-#  if defined(BOOST_ASIO_MSVC)
-#   if (_MSC_VER >= 1700)
-#    define BOOST_ASIO_HAS_STD_ALIGN 1
-#   endif // (_MSC_VER >= 1700)
-#  endif // defined(BOOST_ASIO_MSVC)
-# endif // !defined(BOOST_ASIO_DISABLE_STD_ALIGN)
-#endif // !defined(BOOST_ASIO_HAS_STD_ALIGN)
+# define BOOST_ASIO_HAS_STD_ALIGN 1
 # define BOOST_ASIO_HAS_STD_SYSTEM_ERROR 1
 # define BOOST_ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true)
 # define BOOST_ASIO_HAS_STD_ARRAY 1
@@ -363,6 +341,19 @@
 # endif // !defined(BOOST_ASIO_DISABLE_VARIADIC_LAMBDA_CAPTURES)
 #endif // !defined(BOOST_ASIO_HAS_VARIADIC_LAMBDA_CAPTURES)
 
+// Support for inline variables.
+#if !defined(BOOST_ASIO_HAS_INLINE_VARIABLES)
+# if !defined(BOOST_ASIO_DISABLE_INLINE_VARIABLES)
+#  if (__cplusplus >= 201703) && (__cpp_inline_variables >= 201606)
+#   define BOOST_ASIO_HAS_INLINE_VARIABLES 1
+#   define BOOST_ASIO_INLINE_VARIABLE inline
+#  endif // (__cplusplus >= 201703) && (__cpp_inline_variables >= 201606)
+# endif // !defined(BOOST_ASIO_DISABLE_INLINE_VARIABLES)
+#endif // !defined(BOOST_ASIO_HAS_INLINE_VARIABLES)
+#if !defined(BOOST_ASIO_INLINE_VARIABLE)
+# define BOOST_ASIO_INLINE_VARIABLE
+#endif // !defined(BOOST_ASIO_INLINE_VARIABLE)
+
 // Default alignment.
 #if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
 # define BOOST_ASIO_DEFAULT_ALIGN __STDCPP_DEFAULT_NEW_ALIGNMENT__
@@ -384,7 +375,9 @@
 #    if defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
 #     if (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC) \
         && !defined(_LIBCPP_MSVCRT) && !defined(__MINGW32__)
-#      if defined(__APPLE__)
+#      if defined(__ANDROID__) && (__ANDROID_API__ >= 28)
+#        define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
+#      elif defined(__APPLE__)
 #       if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
 #        if (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #         define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1
@@ -554,9 +547,9 @@
 #    define BOOST_ASIO_HAS_STD_INVOKE_RESULT 1
 #   endif // (_MSC_VER >= 1911 && _MSVC_LANG >= 201703)
 #  else // defined(BOOST_ASIO_MSVC)
-#   if (__cplusplus >= 201703)
+#   if (__cplusplus >= 201703) && (__cpp_lib_is_invocable >= 201703)
 #    define BOOST_ASIO_HAS_STD_INVOKE_RESULT 1
-#   endif // (__cplusplus >= 201703)
+#   endif // (__cplusplus >= 201703) && (__cpp_lib_is_invocable >= 201703)
 #  endif // defined(BOOST_ASIO_MSVC)
 # endif // !defined(BOOST_ASIO_DISABLE_STD_INVOKE_RESULT)
 #endif // !defined(BOOST_ASIO_HAS_STD_INVOKE_RESULT)
@@ -1297,7 +1290,10 @@
 // Support the co_await keyword on compilers known to allow it.
 #if !defined(BOOST_ASIO_HAS_CO_AWAIT)
 # if !defined(BOOST_ASIO_DISABLE_CO_AWAIT)
-#  if defined(BOOST_ASIO_MSVC)
+#  if (__cplusplus >= 202002) \
+     && (__cpp_impl_coroutine >= 201902) && (__cpp_lib_coroutine >= 201902)
+#   define BOOST_ASIO_HAS_CO_AWAIT 1
+#  elif defined(BOOST_ASIO_MSVC)
 #   if (_MSC_VER >= 1928) && (_MSVC_LANG >= 201705) && !defined(__clang__)
 #    define BOOST_ASIO_HAS_CO_AWAIT 1
 #   elif (_MSC_FULL_VER >= 190023506)
@@ -1408,11 +1404,9 @@
 // Standard library support for snprintf.
 #if !defined(BOOST_ASIO_HAS_SNPRINTF)
 # if !defined(BOOST_ASIO_DISABLE_SNPRINTF)
-#  if defined(__apple_build_version__)
-#    if (__clang_major__ >= 14)
-#     define BOOST_ASIO_HAS_SNPRINTF 1
-#    endif // (__clang_major__ >= 14)
-#  endif // defined(__apple_build_version__)
+#  if defined(__APPLE__)
+#   define BOOST_ASIO_HAS_SNPRINTF 1
+#  endif // defined(__APPLE__)
 # endif // !defined(BOOST_ASIO_DISABLE_SNPRINTF)
 #endif // !defined(BOOST_ASIO_HAS_SNPRINTF)
 

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

@@ -104,7 +104,11 @@ public:
   void move_construct(implementation_type& impl,
       implementation_type& other_impl)
   {
-    scheduler_.move_timer(timer_queue_, impl.timer_data, other_impl.timer_data);
+    if (other_impl.might_have_pending_waits)
+    {
+      scheduler_.move_timer(timer_queue_,
+          impl.timer_data, other_impl.timer_data);
+    }
 
     impl.expiry = other_impl.expiry;
     other_impl.expiry = time_type();

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

@@ -17,121 +17,12 @@
 
 #include <boost/asio/detail/config.hpp>
 #include <boost/asio/detail/memory.hpp>
-#include <boost/asio/detail/noncopyable.hpp>
 #include <boost/asio/detail/recycling_allocator.hpp>
-#include <boost/asio/detail/thread_info_base.hpp>
 #include <boost/asio/associated_allocator.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
-namespace boost {
-namespace asio {
-namespace detail {
-
-inline void* default_allocate(std::size_t s,
-    std::size_t align = BOOST_ASIO_DEFAULT_ALIGN)
-{
-#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  return boost::asio::detail::thread_info_base::allocate(
-      boost::asio::detail::thread_context::top_of_thread_call_stack(),
-      s, align);
-#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  return boost::asio::aligned_new(align, s);
-#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-}
-
-inline void default_deallocate(void* p, std::size_t s)
-{
-#if !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  boost::asio::detail::thread_info_base::deallocate(
-      boost::asio::detail::thread_context::top_of_thread_call_stack(), p, s);
-#else // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-  (void)s;
-  boost::asio::aligned_delete(p);
-#endif // !defined(BOOST_ASIO_DISABLE_SMALL_BLOCK_RECYCLING)
-}
-
-template <typename T>
-class default_allocator
-{
-public:
-  typedef T value_type;
-
-  template <typename U>
-  struct rebind
-  {
-    typedef default_allocator<U> other;
-  };
-
-  default_allocator() noexcept
-  {
-  }
-
-  template <typename U>
-  default_allocator(const default_allocator<U>&) noexcept
-  {
-  }
-
-  T* allocate(std::size_t n)
-  {
-    return static_cast<T*>(default_allocate(sizeof(T) * n, alignof(T)));
-  }
-
-  void deallocate(T* p, std::size_t n)
-  {
-    default_deallocate(p, sizeof(T) * n);
-  }
-};
-
-template <>
-class default_allocator<void>
-{
-public:
-  typedef void value_type;
-
-  template <typename U>
-  struct rebind
-  {
-    typedef default_allocator<U> other;
-  };
-
-  default_allocator() noexcept
-  {
-  }
-
-  template <typename U>
-  default_allocator(const default_allocator<U>&) noexcept
-  {
-  }
-};
-
-template <typename Allocator>
-struct get_default_allocator
-{
-  typedef Allocator type;
-
-  static type get(const Allocator& a)
-  {
-    return a;
-  }
-};
-
-template <typename T>
-struct get_default_allocator<std::allocator<T>>
-{
-  typedef default_allocator<T> type;
-
-  static type get(const std::allocator<T>&)
-  {
-    return type();
-  }
-};
-
-} // namespace detail
-} // namespace asio
-} // namespace boost
-
-#define BOOST_ASIO_DEFINE_HANDLER_PTR(op) \
+#define BOOST_ASIO_DEFINE_TAGGED_HANDLER_PTR(purpose, op) \
   struct ptr \
   { \
     Handler* h; \
@@ -145,11 +36,11 @@ struct get_default_allocator<std::allocator<T>>
     { \
       typedef typename ::boost::asio::associated_allocator< \
         Handler>::type associated_allocator_type; \
-      typedef typename ::boost::asio::detail::get_default_allocator< \
-        associated_allocator_type>::type default_allocator_type; \
+      typedef typename ::boost::asio::detail::get_recycling_allocator< \
+        associated_allocator_type, purpose>::type default_allocator_type; \
       BOOST_ASIO_REBIND_ALLOC(default_allocator_type, op) a( \
-            ::boost::asio::detail::get_default_allocator< \
-              associated_allocator_type>::get( \
+            ::boost::asio::detail::get_recycling_allocator< \
+              associated_allocator_type, purpose>::get( \
                 ::boost::asio::get_associated_allocator(handler))); \
       return a.allocate(1); \
     } \
@@ -164,11 +55,11 @@ struct get_default_allocator<std::allocator<T>>
       { \
         typedef typename ::boost::asio::associated_allocator< \
           Handler>::type associated_allocator_type; \
-        typedef typename ::boost::asio::detail::get_default_allocator< \
-          associated_allocator_type>::type default_allocator_type; \
+        typedef typename ::boost::asio::detail::get_recycling_allocator< \
+          associated_allocator_type, purpose>::type default_allocator_type; \
         BOOST_ASIO_REBIND_ALLOC(default_allocator_type, op) a( \
-              ::boost::asio::detail::get_default_allocator< \
-                associated_allocator_type>::get( \
+              ::boost::asio::detail::get_recycling_allocator< \
+                associated_allocator_type, purpose>::get( \
                   ::boost::asio::get_associated_allocator(*h))); \
         a.deallocate(static_cast<op*>(v), 1); \
         v = 0; \
@@ -177,6 +68,11 @@ struct get_default_allocator<std::allocator<T>>
   } \
   /**/
 
+#define BOOST_ASIO_DEFINE_HANDLER_PTR(op) \
+  BOOST_ASIO_DEFINE_TAGGED_HANDLER_PTR( \
+      ::boost::asio::detail::thread_info_base::default_tag, op ) \
+  /**/
+
 #define BOOST_ASIO_DEFINE_TAGGED_HANDLER_ALLOCATOR_PTR(purpose, op) \
   struct ptr \
   { \