passenger 6.0.14 → 6.0.16

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

@@ -2,7 +2,7 @@
 // experimental/as_single.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)
@@ -24,7 +24,7 @@ namespace boost {
 namespace asio {
 namespace experimental {
 
-/// Completion token type used to specify that the completion handler
+/// A @ref completion_token adapter used to specify that the completion handler
 /// arguments should be combined into a single argument.
 /**
  * The as_single_t class is used to indicate that any arguments to the
@@ -116,10 +116,11 @@ public:
   CompletionToken token_;
 };
 
-/// Create a completion token to specify that the completion handler arguments
-/// should be combined into a single argument.
+/// Adapt a @ref completion_token to specify that the completion handler
+/// arguments should be combined into a single argument.
 template <typename CompletionToken>
-inline BOOST_ASIO_CONSTEXPR as_single_t<typename decay<CompletionToken>::type>
+BOOST_ASIO_NODISCARD inline
+BOOST_ASIO_CONSTEXPR as_single_t<typename decay<CompletionToken>::type>
 as_single(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token)
 {
   return as_single_t<typename decay<CompletionToken>::type>(

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

@@ -2,7 +2,7 @@
 // experimental/as_tuple.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)
@@ -16,7 +16,7 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include <boost/asio/detail/config.hpp>
-#include <boost/asio/detail/type_traits.hpp>
+#include <boost/asio/as_tuple.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -24,103 +24,10 @@ namespace boost {
 namespace asio {
 namespace experimental {
 
-/// Completion token type used to specify that the completion handler
-/// arguments should be combined into a single tuple argument.
-/**
- * The as_tuple_t class is used to indicate that any arguments to the
- * completion handler should be combined and passed as a single tuple argument.
- * The arguments are first moved into a @c std::tuple and that tuple is then
- * passed to the completion handler.
- */
-template <typename CompletionToken>
-class as_tuple_t
-{
-public:
-  /// Tag type used to prevent the "default" constructor from being used for
-  /// conversions.
-  struct default_constructor_tag {};
-
-  /// Default constructor.
-  /**
-   * This constructor is only valid if the underlying completion token is
-   * default constructible and move constructible. The underlying completion
-   * token is itself defaulted as an argument to allow it to capture a source
-   * location.
-   */
-  BOOST_ASIO_CONSTEXPR as_tuple_t(
-      default_constructor_tag = default_constructor_tag(),
-      CompletionToken token = CompletionToken())
-    : token_(BOOST_ASIO_MOVE_CAST(CompletionToken)(token))
-  {
-  }
-
-  /// Constructor.
-  template <typename T>
-  BOOST_ASIO_CONSTEXPR explicit as_tuple_t(
-      BOOST_ASIO_MOVE_ARG(T) completion_token)
-    : token_(BOOST_ASIO_MOVE_CAST(T)(completion_token))
-  {
-  }
-
-  /// Adapts an executor to add the @c as_tuple_t completion token as the
-  /// default.
-  template <typename InnerExecutor>
-  struct executor_with_default : InnerExecutor
-  {
-    /// Specify @c as_tuple_t as the default completion token type.
-    typedef as_tuple_t default_completion_token_type;
-
-    /// Construct the adapted executor from the inner executor type.
-    template <typename InnerExecutor1>
-    executor_with_default(const InnerExecutor1& ex,
-        typename constraint<
-          conditional<
-            !is_same<InnerExecutor1, executor_with_default>::value,
-            is_convertible<InnerExecutor1, InnerExecutor>,
-            false_type
-          >::type::value
-        >::type = 0) BOOST_ASIO_NOEXCEPT
-      : InnerExecutor(ex)
-    {
-    }
-  };
-
-  /// Type alias to adapt an I/O object to use @c as_tuple_t as its
-  /// default completion token type.
-#if defined(BOOST_ASIO_HAS_ALIAS_TEMPLATES) \
-  || defined(GENERATING_DOCUMENTATION)
-  template <typename T>
-  using as_default_on_t = typename T::template rebind_executor<
-      executor_with_default<typename T::executor_type> >::other;
-#endif // defined(BOOST_ASIO_HAS_ALIAS_TEMPLATES)
-       //   || defined(GENERATING_DOCUMENTATION)
-
-  /// Function helper to adapt an I/O object to use @c as_tuple_t as its
-  /// default completion token type.
-  template <typename T>
-  static typename decay<T>::type::template rebind_executor<
-      executor_with_default<typename decay<T>::type::executor_type>
-    >::other
-  as_default_on(BOOST_ASIO_MOVE_ARG(T) object)
-  {
-    return typename decay<T>::type::template rebind_executor<
-        executor_with_default<typename decay<T>::type::executor_type>
-      >::other(BOOST_ASIO_MOVE_CAST(T)(object));
-  }
-
-//private:
-  CompletionToken token_;
-};
-
-/// Create a completion token to specify that the completion handler arguments
-/// should be combined into a single tuple argument.
-template <typename CompletionToken>
-inline BOOST_ASIO_CONSTEXPR as_tuple_t<typename decay<CompletionToken>::type>
-as_tuple(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token)
-{
-  return as_tuple_t<typename decay<CompletionToken>::type>(
-      BOOST_ASIO_MOVE_CAST(CompletionToken)(completion_token));
-}
+#if !defined(BOOST_ASIO_NO_DEPRECATED)
+using boost::asio::as_tuple_t;
+using boost::asio::as_tuple;
+#endif // !defined(BOOST_ASIO_NO_DEPRECATED)
 
 } // namespace experimental
 } // namespace asio
@@ -128,6 +35,4 @@ as_tuple(BOOST_ASIO_MOVE_ARG(CompletionToken) completion_token)
 
 #include <boost/asio/detail/pop_options.hpp>
 
-#include <boost/asio/experimental/impl/as_tuple.hpp>
-
 #endif // BOOST_ASIO_EXPERIMENTAL_AS_TUPLE_HPP

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

@@ -2,7 +2,7 @@
 // experimental/awaitable_operators.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)
@@ -21,12 +21,12 @@
 #include <tuple>
 #include <variant>
 #include <boost/asio/awaitable.hpp>
+#include <boost/asio/co_spawn.hpp>
 #include <boost/asio/detail/type_traits.hpp>
 #include <boost/asio/experimental/deferred.hpp>
 #include <boost/asio/experimental/parallel_group.hpp>
 #include <boost/asio/multiple_exceptions.hpp>
 #include <boost/asio/this_coro.hpp>
-#include <boost/asio/use_awaitable.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -83,7 +83,7 @@ awaitable<void, Executor> operator&&(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -112,7 +112,7 @@ awaitable<U, Executor> operator&&(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -141,7 +141,7 @@ awaitable<T, Executor> operator&&(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -170,7 +170,7 @@ awaitable<std::tuple<T, U>, Executor> operator&&(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -201,7 +201,7 @@ awaitable<std::tuple<T..., std::monostate>, Executor> operator&&(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -230,7 +230,7 @@ awaitable<std::tuple<T..., U>, Executor> operator&&(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_error(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (ex0 && ex1)
@@ -261,7 +261,7 @@ awaitable<std::variant<std::monostate, std::monostate>, Executor> operator||(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (order[0] == 0)
@@ -303,7 +303,7 @@ awaitable<std::variant<std::monostate, U>, Executor> operator||(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (order[0] == 0)
@@ -347,7 +347,7 @@ awaitable<std::variant<T, std::monostate>, Executor> operator||(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (order[0] == 0)
@@ -391,7 +391,7 @@ awaitable<std::variant<T, U>, Executor> operator||(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   if (order[0] == 0)
@@ -457,7 +457,7 @@ awaitable<std::variant<T..., std::monostate>, Executor> operator||(
       co_spawn(ex, std::move(u), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   using widen = detail::widen_variant<T..., std::monostate>;
@@ -500,7 +500,7 @@ awaitable<std::variant<T..., U>, Executor> operator||(
       co_spawn(ex, detail::awaitable_wrap(std::move(u)), deferred)
     ).async_wait(
       wait_for_one_success(),
-      use_awaitable_t<Executor>{}
+      deferred
     );
 
   using widen = detail::widen_variant<T..., U>;