passenger 6.0.14 → 6.0.15

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

@@ -2,7 +2,7 @@
 // bind_cancellation_slot.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2022 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)
@@ -459,7 +459,8 @@ private:
 /// Associate an object of type @c T with a cancellation slot of type
 /// @c CancellationSlot.
 template <typename CancellationSlot, typename T>
-inline cancellation_slot_binder<typename decay<T>::type, CancellationSlot>
+BOOST_ASIO_NODISCARD inline
+cancellation_slot_binder<typename decay<T>::type, CancellationSlot>
 bind_cancellation_slot(const CancellationSlot& s, BOOST_ASIO_MOVE_ARG(T) t)
 {
   return cancellation_slot_binder<
@@ -620,9 +621,10 @@ public:
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
-    (async_result<T, Signature>::initiate(
+    (async_initiate<T, Signature>(
         declval<init_wrapper<typename decay<Initiation>::type> >(),
-        declval<T>(), declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
+        declval<RawCompletionToken>().get(),
+        declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
   initiate(
       BOOST_ASIO_MOVE_ARG(Initiation) initiation,
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token,
@@ -639,9 +641,9 @@ public:
 
   template <typename Initiation, typename RawCompletionToken>
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
-    (async_result<T, Signature>::initiate(
+    (async_initiate<T, Signature>(
         declval<init_wrapper<typename decay<Initiation>::type> >(),
-        declval<T>())))
+        declval<RawCompletionToken>().get())))
   initiate(
       BOOST_ASIO_MOVE_ARG(Initiation) initiation,
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token)
@@ -657,9 +659,10 @@ public:
   template <typename Initiation, typename RawCompletionToken, \
       BOOST_ASIO_VARIADIC_TPARAMS(n)> \
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature, \
-    (async_result<T, Signature>::initiate( \
+    (async_initiate<T, Signature>( \
         declval<init_wrapper<typename decay<Initiation>::type> >(), \
-        declval<T>(), BOOST_ASIO_VARIADIC_MOVE_DECLVAL(n)))) \
+        declval<RawCompletionToken>().get(), \
+        BOOST_ASIO_VARIADIC_MOVE_DECLVAL(n)))) \
   initiate( \
       BOOST_ASIO_MOVE_ARG(Initiation) initiation, \
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token, \

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

@@ -2,7 +2,7 @@
 // bind_executor.hpp
 // ~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2021 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2022 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)
@@ -487,7 +487,7 @@ private:
 
 /// Associate an object of type @c T with an executor of type @c Executor.
 template <typename Executor, typename T>
-inline executor_binder<typename decay<T>::type, Executor>
+BOOST_ASIO_NODISCARD inline executor_binder<typename decay<T>::type, Executor>
 bind_executor(const Executor& ex, BOOST_ASIO_MOVE_ARG(T) t,
     typename constraint<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
@@ -499,7 +499,7 @@ bind_executor(const Executor& ex, BOOST_ASIO_MOVE_ARG(T) t,
 
 /// Associate an object of type @c T with an execution context's executor.
 template <typename ExecutionContext, typename T>
-inline executor_binder<typename decay<T>::type,
+BOOST_ASIO_NODISCARD inline executor_binder<typename decay<T>::type,
   typename ExecutionContext::executor_type>
 bind_executor(ExecutionContext& ctx, BOOST_ASIO_MOVE_ARG(T) t,
     typename constraint<is_convertible<
@@ -519,20 +519,40 @@ struct uses_executor<executor_binder<T, Executor>, Executor>
 namespace detail {
 
 template <typename TargetAsyncResult, typename Executor, typename = void>
-struct executor_binder_async_result_completion_handler_type
+class executor_binder_completion_handler_async_result
 {
+public:
+  template <typename T>
+  explicit executor_binder_completion_handler_async_result(T&)
+  {
+  }
 };
 
 template <typename TargetAsyncResult, typename Executor>
-struct executor_binder_async_result_completion_handler_type<
+class executor_binder_completion_handler_async_result<
   TargetAsyncResult, Executor,
   typename void_type<
     typename TargetAsyncResult::completion_handler_type
   >::type>
 {
+public:
   typedef executor_binder<
     typename TargetAsyncResult::completion_handler_type, Executor>
       completion_handler_type;
+
+  explicit executor_binder_completion_handler_async_result(
+      typename TargetAsyncResult::completion_handler_type& handler)
+    : target_(handler)
+  {
+  }
+
+  typename TargetAsyncResult::return_type get()
+  {
+    return target_.get();
+  }
+
+private:
+  TargetAsyncResult target_;
 };
 
 template <typename TargetAsyncResult, typename = void>
@@ -554,22 +574,18 @@ struct executor_binder_async_result_return_type<
 
 template <typename T, typename Executor, typename Signature>
 class async_result<executor_binder<T, Executor>, Signature> :
-  public detail::executor_binder_async_result_completion_handler_type<
+  public detail::executor_binder_completion_handler_async_result<
     async_result<T, Signature>, Executor>,
   public detail::executor_binder_async_result_return_type<
     async_result<T, Signature> >
 {
 public:
   explicit async_result(executor_binder<T, Executor>& b)
-    : target_(b.get())
+    : detail::executor_binder_completion_handler_async_result<
+        async_result<T, Signature>, Executor>(b.get())
   {
   }
 
-  typename async_result<T, Signature>::return_type get()
-  {
-    return target_.get();
-  }
-
   template <typename Initiation>
   struct init_wrapper
   {
@@ -660,9 +676,10 @@ public:
 
   template <typename Initiation, typename RawCompletionToken, typename... Args>
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
-    (async_result<T, Signature>::initiate(
+    (async_initiate<T, Signature>(
         declval<init_wrapper<typename decay<Initiation>::type> >(),
-        declval<T>(), declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
+        declval<RawCompletionToken>().get(),
+        declval<BOOST_ASIO_MOVE_ARG(Args)>()...)))
   initiate(
       BOOST_ASIO_MOVE_ARG(Initiation) initiation,
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token,
@@ -678,9 +695,9 @@ public:
 
   template <typename Initiation, typename RawCompletionToken>
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature,
-    (async_result<T, Signature>::initiate(
+    (async_initiate<T, Signature>(
         declval<init_wrapper<typename decay<Initiation>::type> >(),
-        declval<T>())))
+        declval<RawCompletionToken>().get())))
   initiate(
       BOOST_ASIO_MOVE_ARG(Initiation) initiation,
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token)
@@ -695,9 +712,10 @@ public:
   template <typename Initiation, typename RawCompletionToken, \
       BOOST_ASIO_VARIADIC_TPARAMS(n)> \
   static BOOST_ASIO_INITFN_DEDUCED_RESULT_TYPE(T, Signature, \
-    (async_result<T, Signature>::initiate( \
+    (async_initiate<T, Signature>( \
         declval<init_wrapper<typename decay<Initiation>::type> >(), \
-        declval<T>(), BOOST_ASIO_VARIADIC_MOVE_DECLVAL(n)))) \
+        declval<RawCompletionToken>().get(), \
+        BOOST_ASIO_VARIADIC_MOVE_DECLVAL(n)))) \
   initiate( \
       BOOST_ASIO_MOVE_ARG(Initiation) initiation, \
       BOOST_ASIO_MOVE_ARG(RawCompletionToken) token, \
@@ -717,8 +735,6 @@ public:
 private:
   async_result(const async_result&) BOOST_ASIO_DELETED;
   async_result& operator=(const async_result&) BOOST_ASIO_DELETED;
-
-  async_result<T, Signature> target_;
 };
 
 template <template <typename, typename> class Associator,