diff options
author | thegeorg <thegeorg@yandex-team.com> | 2024-09-18 11:29:30 +0300 |
---|---|---|
committer | thegeorg <thegeorg@yandex-team.com> | 2024-09-18 11:40:21 +0300 |
commit | ad61d947fcb28bc17d93e787e4d2fc1cec5d76e9 (patch) | |
tree | 3e447168322ca226808215a69818fe3dd1fae110 /contrib | |
parent | f4885374131a18b9906b7400d1d3e9485ae1f0aa (diff) | |
download | ydb-ad61d947fcb28bc17d93e787e4d2fc1cec5d76e9.tar.gz |
Update contrib/restricted/boost/asio to 1.78.0
commit_hash:9d71516b9e4bba9433b42c7fc038a8badf799f1e
Diffstat (limited to 'contrib')
5 files changed, 74 insertions, 4 deletions
diff --git a/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp b/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp index 3e810c89f7..8e83197321 100644 --- a/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp +++ b/contrib/restricted/boost/asio/include/boost/asio/detail/config.hpp @@ -583,7 +583,9 @@ #if defined(BOOST_ASIO_HAS_ALIGNOF) # define BOOST_ASIO_ALIGNOF(T) alignof(T) -# if defined(__GNUC__) +# if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__) +# define BOOST_ASIO_DEFAULT_ALIGN __STDCPP_DEFAULT_NEW_ALIGNMENT__ +# elif defined(__GNUC__) # if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) # define BOOST_ASIO_DEFAULT_ALIGN alignof(std::max_align_t) # else // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)) || (__GNUC__ > 4) @@ -603,9 +605,11 @@ # if (__cplusplus >= 201703) # if defined(__clang__) # if defined(BOOST_ASIO_HAS_CLANG_LIBCXX) -# if (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC) +# if (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC) \ + && !defined(_LIBCPP_MSVCRT) && !defined(__MINGW32__) # define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1 # endif // (_LIBCPP_STD_VER > 14) && defined(_LIBCPP_HAS_ALIGNED_ALLOC) + // && !defined(_LIBCPP_MSVCRT) && !defined(__MINGW32__) # elif defined(_GLIBCXX_HAVE_ALIGNED_ALLOC) # define BOOST_ASIO_HAS_STD_ALIGNED_ALLOC 1 # endif // defined(_GLIBCXX_HAVE_ALIGNED_ALLOC) @@ -1471,6 +1475,13 @@ # endif // !defined(BOOST_ASIO_HAS_TIMERFD) #endif // defined(__linux__) +// Linux: io_uring is used instead of epoll. +#if !defined(BOOST_ASIO_HAS_IO_URING_AS_DEFAULT) +# if !defined(BOOST_ASIO_HAS_EPOLL) && defined(BOOST_ASIO_HAS_IO_URING) +# define BOOST_ASIO_HAS_IO_URING_AS_DEFAULT 1 +# endif // !defined(BOOST_ASIO_HAS_EPOLL) && defined(BOOST_ASIO_HAS_IO_URING) +#endif // !defined(BOOST_ASIO_HAS_IO_URING_AS_DEFAULT) + // Mac OS X, FreeBSD, NetBSD, OpenBSD: kqueue. #if (defined(__MACH__) && defined(__APPLE__)) \ || defined(__FreeBSD__) \ @@ -1572,6 +1583,34 @@ # endif // !defined(BOOST_ASIO_DISABLE_LOCAL_SOCKETS) #endif // !defined(BOOST_ASIO_HAS_LOCAL_SOCKETS) +// Files. +#if !defined(BOOST_ASIO_HAS_FILE) +# if !defined(BOOST_ASIO_DISABLE_FILE) +# if defined(BOOST_ASIO_HAS_WINDOWS_RANDOM_ACCESS_HANDLE) +# define BOOST_ASIO_HAS_FILE 1 +# elif defined(BOOST_ASIO_HAS_IO_URING) +# define BOOST_ASIO_HAS_FILE 1 +# endif // defined(BOOST_ASIO_HAS_IO_URING) +# endif // !defined(BOOST_ASIO_DISABLE_FILE) +#endif // !defined(BOOST_ASIO_HAS_FILE) + +// Pipes. +#if !defined(BOOST_ASIO_HAS_PIPE) +# if defined(BOOST_ASIO_HAS_IOCP) \ + || !defined(BOOST_ASIO_WINDOWS) \ + && !defined(BOOST_ASIO_WINDOWS_RUNTIME) \ + && !defined(__CYGWIN__) +# if !defined(__SYMBIAN32__) +# if !defined(BOOST_ASIO_DISABLE_PIPE) +# define BOOST_ASIO_HAS_PIPE 1 +# endif // !defined(BOOST_ASIO_DISABLE_PIPE) +# endif // !defined(__SYMBIAN32__) +# endif // defined(BOOST_ASIO_HAS_IOCP) + // || !defined(BOOST_ASIO_WINDOWS) + // && !defined(BOOST_ASIO_WINDOWS_RUNTIME) + // && !defined(__CYGWIN__) +#endif // !defined(BOOST_ASIO_HAS_PIPE) + // Can use sigaction() instead of signal(). #if !defined(BOOST_ASIO_HAS_SIGACTION) # if !defined(BOOST_ASIO_DISABLE_SIGACTION) diff --git a/contrib/restricted/boost/asio/include/boost/asio/detail/is_buffer_sequence.hpp b/contrib/restricted/boost/asio/include/boost/asio/detail/is_buffer_sequence.hpp index 53d33ad445..402e680199 100644 --- a/contrib/restricted/boost/asio/include/boost/asio/detail/is_buffer_sequence.hpp +++ b/contrib/restricted/boost/asio/include/boost/asio/detail/is_buffer_sequence.hpp @@ -25,6 +25,8 @@ namespace asio { class mutable_buffer; class const_buffer; +class mutable_registered_buffer; +class const_registered_buffer; namespace detail { @@ -259,6 +261,30 @@ struct is_buffer_sequence<const_buffer, mutable_buffer> { }; +template <> +struct is_buffer_sequence<mutable_registered_buffer, mutable_buffer> + : true_type +{ +}; + +template <> +struct is_buffer_sequence<mutable_registered_buffer, const_buffer> + : true_type +{ +}; + +template <> +struct is_buffer_sequence<const_registered_buffer, const_buffer> + : true_type +{ +}; + +template <> +struct is_buffer_sequence<const_registered_buffer, mutable_buffer> + : false_type +{ +}; + template <typename T> struct is_dynamic_buffer_class_v1 : integral_constant<bool, diff --git a/contrib/restricted/boost/asio/include/boost/asio/detail/pop_options.hpp b/contrib/restricted/boost/asio/include/boost/asio/detail/pop_options.hpp index c34eb983b4..89008ccdb9 100644 --- a/contrib/restricted/boost/asio/include/boost/asio/detail/pop_options.hpp +++ b/contrib/restricted/boost/asio/include/boost/asio/detail/pop_options.hpp @@ -146,4 +146,8 @@ # endif # endif +# pragma pop_macro ("emit") +# pragma pop_macro ("signal") +# pragma pop_macro ("slot") + #endif diff --git a/contrib/restricted/boost/asio/include/boost/asio/detail/push_options.hpp b/contrib/restricted/boost/asio/include/boost/asio/detail/push_options.hpp index 1a709cb1d4..020e97be44 100644 --- a/contrib/restricted/boost/asio/include/boost/asio/detail/push_options.hpp +++ b/contrib/restricted/boost/asio/include/boost/asio/detail/push_options.hpp @@ -169,6 +169,7 @@ # pragma warning (disable:4127) # pragma warning (disable:4180) # pragma warning (disable:4244) +# pragma warning (disable:4265) # pragma warning (disable:4355) # pragma warning (disable:4510) # pragma warning (disable:4512) diff --git a/contrib/restricted/boost/asio/ya.make b/contrib/restricted/boost/asio/ya.make index 58792d2350..4a7739cb3f 100644 --- a/contrib/restricted/boost/asio/ya.make +++ b/contrib/restricted/boost/asio/ya.make @@ -9,9 +9,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.77.0) +VERSION(1.78.0) -ORIGINAL_SOURCE(https://github.com/boostorg/asio/archive/boost-1.77.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/asio/archive/boost-1.78.0.tar.gz) PEERDIR( contrib/libs/openssl |