couchbase 4.2.0 → 4.2.1

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution/set_error.hpp

@@ -2,7 +2,7 @@
 // execution/set_error.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution/set_value.hpp

@@ -2,7 +2,7 @@
 // execution/set_value.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution/start.hpp

@@ -2,7 +2,7 @@
 // execution/start.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution/submit.hpp

@@ -2,7 +2,7 @@
 // execution/submit.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution.hpp

@@ -2,7 +2,7 @@
 // execution.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/execution_context.hpp

@@ -2,7 +2,7 @@
 // execution_context.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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/executor.hpp

@@ -2,7 +2,7 @@
 // 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)

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/executor_work_guard.hpp

@@ -2,7 +2,7 @@
 // executor_work_guard.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)
@@ -17,8 +17,6 @@
 
 #include "asio/detail/config.hpp"
 
-#if !defined(ASIO_NO_TS_EXECUTORS)
-
 #include "asio/associated_executor.hpp"
 #include "asio/detail/type_traits.hpp"
 #include "asio/execution.hpp"
@@ -36,13 +34,11 @@ class executor_work_guard;
 
 #endif // !defined(ASIO_EXECUTOR_WORK_GUARD_DECL)
 
-/// An object of type @c executor_work_guard controls ownership of executor work
-/// within a scope.
 #if defined(GENERATING_DOCUMENTATION)
+
+/// An object of type @c executor_work_guard controls ownership of outstanding
+/// executor work within a scope.
 template <typename Executor>
-#else // defined(GENERATING_DOCUMENTATION)
-template <typename Executor, typename, typename>
-#endif // defined(GENERATING_DOCUMENTATION)
 class executor_work_guard
 {
 public:
@@ -53,6 +49,50 @@ public:
   /**
    * Stores a copy of @c e and calls <tt>on_work_started()</tt> on it.
    */
+  explicit executor_work_guard(const executor_type& e) ASIO_NOEXCEPT;
+
+  /// Copy constructor.
+  executor_work_guard(const executor_work_guard& other) ASIO_NOEXCEPT;
+
+  /// Move constructor.
+  executor_work_guard(executor_work_guard&& other) ASIO_NOEXCEPT;
+
+  /// Destructor.
+  /**
+   * Unless the object has already been reset, or is in a moved-from state,
+   * calls <tt>on_work_finished()</tt> on the stored executor.
+   */
+  ~executor_work_guard();
+
+  /// Obtain the associated executor.
+  executor_type get_executor() const ASIO_NOEXCEPT;
+
+  /// Whether the executor_work_guard object owns some outstanding work.
+  bool owns_work() const ASIO_NOEXCEPT;
+
+  /// Indicate that the work is no longer outstanding.
+  /**
+   * Unless the object has already been reset, or is in a moved-from state,
+   * calls <tt>on_work_finished()</tt> on the stored executor.
+   */
+  void reset() ASIO_NOEXCEPT;
+};
+
+#endif // defined(GENERATING_DOCUMENTATION)
+
+#if !defined(GENERATING_DOCUMENTATION)
+
+#if !defined(ASIO_NO_TS_EXECUTORS)
+
+template <typename Executor>
+class executor_work_guard<Executor,
+    typename enable_if<
+      is_executor<Executor>::value
+    >::type>
+{
+public:
+  typedef Executor executor_type;
+
   explicit executor_work_guard(const executor_type& e) ASIO_NOEXCEPT
     : executor_(e),
       owns_(true)
@@ -60,7 +100,6 @@ public:
     executor_.on_work_started();
   }
 
-  /// Copy constructor.
   executor_work_guard(const executor_work_guard& other) ASIO_NOEXCEPT
     : executor_(other.executor_),
       owns_(other.owns_)
@@ -69,44 +108,31 @@ public:
       executor_.on_work_started();
   }
 
-#if defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
-  /// Move constructor.
+#if defined(ASIO_HAS_MOVE)
   executor_work_guard(executor_work_guard&& other) ASIO_NOEXCEPT
     : executor_(ASIO_MOVE_CAST(Executor)(other.executor_)),
       owns_(other.owns_)
   {
     other.owns_ = false;
   }
-#endif //  defined(ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
+#endif // defined(ASIO_HAS_MOVE)
 
-  /// Destructor.
-  /**
-   * Unless the object has already been reset, or is in a moved-from state,
-   * calls <tt>on_work_finished()</tt> on the stored executor.
-   */
   ~executor_work_guard()
   {
     if (owns_)
       executor_.on_work_finished();
   }
 
-  /// Obtain the associated executor.
   executor_type get_executor() const ASIO_NOEXCEPT
   {
     return executor_;
   }
 
-  /// Whether the executor_work_guard object owns some outstanding work.
   bool owns_work() const ASIO_NOEXCEPT
   {
     return owns_;
   }
 
-  /// Indicate that the work is no longer outstanding.
-  /**
-   * Unless the object has already been reset, or is in a moved-from state,
-   * calls <tt>on_work_finished()</tt> on the stored executor.
-   */
   void reset() ASIO_NOEXCEPT
   {
     if (owns_)
@@ -124,7 +150,7 @@ private:
   bool owns_;
 };
 
-#if !defined(GENERATING_DOCUMENTATION)
+#endif // !defined(ASIO_NO_TS_EXECUTORS)
 
 template <typename Executor>
 class executor_work_guard<Executor,
@@ -218,8 +244,14 @@ private:
 #endif // !defined(GENERATING_DOCUMENTATION)
 
 /// Create an @ref executor_work_guard object.
+/**
+ * @param ex An executor.
+ *
+ * @returns A work guard constructed with the specified executor.
+ */
 template <typename Executor>
-inline executor_work_guard<Executor> make_work_guard(const Executor& ex,
+ASIO_NODISCARD inline executor_work_guard<Executor>
+make_work_guard(const Executor& ex,
     typename constraint<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
     >::type = 0)
@@ -228,8 +260,15 @@ inline executor_work_guard<Executor> make_work_guard(const Executor& ex,
 }
 
 /// Create an @ref executor_work_guard object.
+/**
+ * @param ctx An execution context, from which an executor will be obtained.
+ *
+ * @returns A work guard constructed with the execution context's executor,
+ * obtained by performing <tt>ctx.get_executor()</tt>.
+ */
 template <typename ExecutionContext>
-inline executor_work_guard<typename ExecutionContext::executor_type>
+ASIO_NODISCARD inline
+executor_work_guard<typename ExecutionContext::executor_type>
 make_work_guard(ExecutionContext& ctx,
     typename constraint<
       is_convertible<ExecutionContext&, execution_context&>::value
@@ -240,8 +279,16 @@ make_work_guard(ExecutionContext& ctx,
 }
 
 /// Create an @ref executor_work_guard object.
+/**
+ * @param t An arbitrary object, such as a completion handler, for which the
+ * associated executor will be obtained.
+ *
+ * @returns A work guard constructed with the associated executor of the object
+ * @c t, which is obtained as if by calling <tt>get_associated_executor(t)</tt>.
+ */
 template <typename T>
-inline executor_work_guard<typename associated_executor<T>::type>
+ASIO_NODISCARD inline
+executor_work_guard<typename associated_executor<T>::type>
 make_work_guard(const T& t,
     typename constraint<
       !is_executor<T>::value
@@ -258,8 +305,20 @@ make_work_guard(const T& t,
 }
 
 /// Create an @ref executor_work_guard object.
+/**
+ * @param t An arbitrary object, such as a completion handler, for which the
+ * associated executor will be obtained.
+ *
+ * @param ex An executor to be used as the candidate object when determining the
+ * associated executor.
+ *
+ * @returns A work guard constructed with the associated executor of the object
+ * @c t, which is obtained as if by calling <tt>get_associated_executor(t,
+ * ex)</tt>.
+ */
 template <typename T, typename Executor>
-inline executor_work_guard<typename associated_executor<T, Executor>::type>
+ASIO_NODISCARD inline
+executor_work_guard<typename associated_executor<T, Executor>::type>
 make_work_guard(const T& t, const Executor& ex,
     typename constraint<
       is_executor<Executor>::value || execution::is_executor<Executor>::value
@@ -270,8 +329,19 @@ make_work_guard(const T& t, const Executor& ex,
 }
 
 /// Create an @ref executor_work_guard object.
+/**
+ * @param t An arbitrary object, such as a completion handler, for which the
+ * associated executor will be obtained.
+ *
+ * @param ctx An execution context, from which an executor is obtained to use as
+ * the candidate object for determining the associated executor.
+ *
+ * @returns A work guard constructed with the associated executor of the object
+ * @c t, which is obtained as if by calling <tt>get_associated_executor(t,
+ * ctx.get_executor())</tt>.
+ */
 template <typename T, typename ExecutionContext>
-inline executor_work_guard<typename associated_executor<T,
+ASIO_NODISCARD inline executor_work_guard<typename associated_executor<T,
   typename ExecutionContext::executor_type>::type>
 make_work_guard(const T& t, ExecutionContext& ctx,
     typename constraint<
@@ -297,6 +367,4 @@ make_work_guard(const T& t, ExecutionContext& ctx,
 
 #include "asio/detail/pop_options.hpp"
 
-#endif // !defined(ASIO_NO_TS_EXECUTORS)
-
 #endif // ASIO_EXECUTOR_WORK_GUARD_HPP

package/deps/couchbase-cxx-client/third_party/asio/asio/include/asio/experimental/append.hpp

@@ -2,7 +2,7 @@
 // experimental/append.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,56 +16,21 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include <tuple>
-#include "asio/detail/type_traits.hpp"
+#include "asio/append.hpp"
 
 #include "asio/detail/push_options.hpp"
 
 namespace asio {
 namespace experimental {
 
-/// Completion token type used to specify that the completion handler
-/// arguments should be passed additional values after the results of the
-/// operation.
-template <typename CompletionToken, typename... Values>
-class append_t
-{
-public:
-  /// Constructor.
-  template <typename T, typename... V>
-  ASIO_CONSTEXPR explicit append_t(
-      ASIO_MOVE_ARG(T) completion_token,
-      ASIO_MOVE_ARG(V)... values)
-    : token_(ASIO_MOVE_CAST(T)(completion_token)),
-      values_(ASIO_MOVE_CAST(V)(values)...)
-  {
-  }
-
-//private:
-  CompletionToken token_;
-  std::tuple<Values...> values_;
-};
-
-/// Completion token type used to specify that the completion handler
-/// arguments should be passed additional values after the results of the
-/// operation.
-template <typename CompletionToken, typename... Values>
-inline ASIO_CONSTEXPR append_t<
-  typename decay<CompletionToken>::type, typename decay<Values>::type...>
-append(ASIO_MOVE_ARG(CompletionToken) completion_token,
-    ASIO_MOVE_ARG(Values)... values)
-{
-  return append_t<
-    typename decay<CompletionToken>::type, typename decay<Values>::type...>(
-      ASIO_MOVE_CAST(CompletionToken)(completion_token),
-      ASIO_MOVE_CAST(Values)(values)...);
-}
+#if !defined(ASIO_NO_DEPRECATED)
+using asio::append_t;
+using asio::append;
+#endif // !defined(ASIO_NO_DEPRECATED)
 
 } // namespace experimental
 } // namespace asio
 
 #include "asio/detail/pop_options.hpp"
 
-#include "asio/experimental/impl/append.hpp"
-
 #endif // ASIO_EXPERIMENTAL_APPEND_HPP

package/deps/couchbase-cxx-client/third_party/asio/asio/include/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)
@@ -23,7 +23,7 @@
 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
@@ -115,10 +115,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 ASIO_CONSTEXPR as_single_t<typename decay<CompletionToken>::type>
+ASIO_NODISCARD inline
+ASIO_CONSTEXPR as_single_t<typename decay<CompletionToken>::type>
 as_single(ASIO_MOVE_ARG(CompletionToken) completion_token)
 {
   return as_single_t<typename decay<CompletionToken>::type>(

package/deps/couchbase-cxx-client/third_party/asio/asio/include/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,116 +16,21 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include "asio/detail/type_traits.hpp"
+#include "asio/as_tuple.hpp"
 
 #include "asio/detail/push_options.hpp"
 
 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.
-   */
-  ASIO_CONSTEXPR as_tuple_t(
-      default_constructor_tag = default_constructor_tag(),
-      CompletionToken token = CompletionToken())
-    : token_(ASIO_MOVE_CAST(CompletionToken)(token))
-  {
-  }
-
-  /// Constructor.
-  template <typename T>
-  ASIO_CONSTEXPR explicit as_tuple_t(
-      ASIO_MOVE_ARG(T) completion_token)
-    : token_(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) 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(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(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(ASIO_MOVE_ARG(T) object)
-  {
-    return typename decay<T>::type::template rebind_executor<
-        executor_with_default<typename decay<T>::type::executor_type>
-      >::other(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 ASIO_CONSTEXPR as_tuple_t<typename decay<CompletionToken>::type>
-as_tuple(ASIO_MOVE_ARG(CompletionToken) completion_token)
-{
-  return as_tuple_t<typename decay<CompletionToken>::type>(
-      ASIO_MOVE_CAST(CompletionToken)(completion_token));
-}
+#if !defined(ASIO_NO_DEPRECATED)
+using asio::as_tuple_t;
+using asio::as_tuple;
+#endif // !defined(ASIO_NO_DEPRECATED)
 
 } // namespace experimental
 } // namespace asio
 
 #include "asio/detail/pop_options.hpp"
 
-#include "asio/experimental/impl/as_tuple.hpp"
-
 #endif // ASIO_EXPERIMENTAL_AS_TUPLE_HPP

package/deps/couchbase-cxx-client/third_party/asio/asio/include/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 "asio/awaitable.hpp"
+#include "asio/co_spawn.hpp"
 #include "asio/detail/type_traits.hpp"
 #include "asio/experimental/deferred.hpp"
 #include "asio/experimental/parallel_group.hpp"
 #include "asio/multiple_exceptions.hpp"
 #include "asio/this_coro.hpp"
-#include "asio/use_awaitable.hpp"
 
 #include "asio/detail/push_options.hpp"
 
@@ -82,7 +82,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)
@@ -111,7 +111,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)
@@ -140,7 +140,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)
@@ -169,7 +169,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)
@@ -200,7 +200,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)
@@ -229,7 +229,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)
@@ -260,7 +260,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)
@@ -302,7 +302,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)
@@ -346,7 +346,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)
@@ -390,7 +390,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)
@@ -456,7 +456,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>;
@@ -499,7 +499,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>;