Merge asio 1.32.0 from 'develop'.

Author: chriskohlhoff

doc/history.qbk

@@ -7,7 +7,30 @@
 
 [section:history Revision History]
 
-[heading Asio 1.31.0 / Boost 1.86 beta]
+[heading Asio 1.32.0 / Boost 1.86]
+
+* Fixed an issue in `co_composed` caused by a missing `decay`.
+* Fixed an issue in `co_composed` due to a missing reference in a cast to a base
+  class type.
+* Changed to use the standard C++20 coroutine feature test macro by default.
+* Changed to use `std::aligned_alloc` on Android, when available.
+* Fixed an integer conversion warning in `ip::address_v6`, on iOS/tvOS.
+* Added missing include of `<malloc.h>` required for `_alloca`.
+* Changed to use a standard feature test macro to check if the standard library
+  supports `std::invoke_result`.
+* Fixed handling of `file_base::append` in Windows file support.
+* Fixed some warnings in IP address to string conversion.
+* Added support for using `co_spawn` when exceptions are disabled.
+* Fixed `spawn.hpp` header to be self-contained.
+* Enabled TLS v1.3 options for WolfSSL.
+* Fixed `experimental::coro` implementation to use the correct cancellation
+  slot.
+* Fixed `io_context::strand::wrap()` so that its return value has an associated
+  executor.
+* Marked `constexpr` global variables as `inline`.
+* Documentation fixes.
+
+[heading Asio 1.31.0]
 
 * Changed the `default_completion_token` trait's primary template to select
   `deferred` as the default completion token. As a result, most asynchronous

doc/overview/cancellation.qbk

@@ -201,7 +201,7 @@ occur.
 
 Furthermore, a stronger guarantee always satisfies the requirements of a weaker
 guarantee. The `partial` guarantee still satisfies the `terminal` guarantee.
-The `total` guarantee satisfies both `partial` and `total`. This means that
+The `total` guarantee satisfies both `partial` and `terminal`. This means that
 when an operation supports a given cancellation type as its strongest
 guarantee, it should honour cancellation requests for any of the weaker
 guarantees.

doc/reference.dox

@@ -317,6 +317,7 @@ PREDEFINED             = GENERATING_DOCUMENTATION \
                          BOOST_ASIO_CONSTEXPR=constexpr \
                          BOOST_ASIO_NOEXCEPT=noexcept \
                          BOOST_ASIO_NODISCARD= \
+                         BOOST_ASIO_INLINE_VARIABLE= \
                          BOOST_ASIO_COMPLETION_SIGNATURE=typename \
                          BOOST_ASIO_COMPLETION_HANDLER_FOR(s)=typename \
                          BOOST_ASIO_COMPLETION_TOKEN_FOR(s)=typename \

doc/tutorial.qbk

@@ -653,6 +653,11 @@ Just as it would with a call from a single thread, concurrent calls to boost::as
   ``''''''``  boost::asio::io_context io;
   ``''''''``  printer p(io);
   ``''''''``  std::thread t([&]{ io.run(); });
+  ``''''''``  io.run();
+  ``''''''``  t.join();
+
+  ``''''''``  return 0;
+  ``''''''``}
 
 See the [link boost_asio.tutorial.tuttimer5.src full source listing]
 

example/cpp11/tutorial/timer_dox.txt

@@ -365,6 +365,7 @@ boost::asio::io_context::run() will continue to execute while there is "work" le
 do. The background thread will not exit until all asynchronous operations have
 completed.
 
+\until join
 \until }
 
 See the \ref tuttimer5src "full source listing" \n

include/boost/asio/as_tuple.hpp

@@ -142,7 +142,7 @@ struct partial_as_tuple
  * asynchronous operation's default completion token (or boost::asio::deferred
  * if no default is available).
  */
-constexpr partial_as_tuple as_tuple;
+BOOST_ASIO_INLINE_VARIABLE constexpr partial_as_tuple as_tuple;
 
 } // namespace asio
 } // namespace boost

include/boost/asio/co_composed.hpp

@@ -963,7 +963,7 @@ class co_composed_promise
 
             Handler handler(std::move(a.promise_.state_.handler_));
             std::tuple<decay_t<Args>...> result(
-                std::move(static_cast<std::tuple<Args&&...>>(a.result_)));
+                std::move(static_cast<std::tuple<Args&&...>&>(a.result_)));
 
             co_composed_handler_base<Executors, Handler,
               Return>(std::move(composed_handler));
@@ -1104,7 +1104,7 @@ class initiate_co_composed<Implementation, void(), Signatures...>
 };
 
 template <typename... Signatures, typename Implementation, typename Executors>
-inline initiate_co_composed<Implementation, Executors, Signatures...>
+inline initiate_co_composed<decay_t<Implementation>, Executors, Signatures...>
 make_initiate_co_composed(Implementation&& implementation,
     composed_io_executors<Executors>&& executors)
 {

include/boost/asio/deferred.hpp

@@ -709,7 +709,7 @@ inline auto operator|(Head head, Tail&& tail)
 /**
  * See the documentation for boost::asio::deferred_t for a usage example.
  */
-constexpr deferred_t deferred;
+BOOST_ASIO_INLINE_VARIABLE constexpr deferred_t deferred;
 
 } // namespace asio
 } // namespace boost

include/boost/asio/detached.hpp

@@ -95,7 +95,7 @@ class detached_t
 /**
  * See the documentation for boost::asio::detached_t for a usage example.
  */
-constexpr detached_t detached;
+BOOST_ASIO_INLINE_VARIABLE constexpr detached_t detached;
 
 } // namespace asio
 } // namespace boost

include/boost/asio/detail/config.hpp

@@ -341,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__
@@ -362,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
@@ -532,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)
@@ -1275,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)
@@ -1386,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)