aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2023-08-18 18:40:48 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2023-08-18 20:34:45 +0300
commit84a01ff9e85a339aae0f9918e09c007e272cb870 (patch)
treedf55a447aea6be16d71f34b4e4ceb38a822e9c17
parenta5e4b805bac7f8f6c779036cf2ab80e8294a3d30 (diff)
downloadydb-84a01ff9e85a339aae0f9918e09c007e272cb870.tar.gz
Update contrib/restricted/boost/system to 1.83.0
-rw-r--r--contrib/restricted/boost/system/include/boost/system/detail/mutex.hpp17
-rw-r--r--contrib/restricted/boost/system/include/boost/system/detail/requires_cxx11.hpp2
-rw-r--r--contrib/restricted/boost/system/ya.make4
3 files changed, 17 insertions, 6 deletions
diff --git a/contrib/restricted/boost/system/include/boost/system/detail/mutex.hpp b/contrib/restricted/boost/system/include/boost/system/detail/mutex.hpp
index 4c2b0fa9e6..c27e08a69f 100644
--- a/contrib/restricted/boost/system/include/boost/system/detail/mutex.hpp
+++ b/contrib/restricted/boost/system/include/boost/system/detail/mutex.hpp
@@ -31,7 +31,9 @@ struct mutex
} // namespace system
} // namespace boost
-#elif defined(BOOST_MSSTL_VERSION) && BOOST_MSSTL_VERSION >= 140
+#else // defined(BOOST_SYSTEM_DISABLE_THREADS)
+
+#if defined(BOOST_MSSTL_VERSION) && BOOST_MSSTL_VERSION >= 140
// Under the MS STL, std::mutex::mutex() is not constexpr, as is
// required by the standard, which leads to initialization order
@@ -40,6 +42,14 @@ struct mutex
#include <shared_mutex>
+#if BOOST_MSSTL_VERSION >= 142 || _HAS_SHARED_MUTEX
+# define BOOST_SYSTEM_HAS_MSSTL_SHARED_MUTEX
+#endif
+
+#endif
+
+#if defined(BOOST_SYSTEM_HAS_MSSTL_SHARED_MUTEX)
+
namespace boost
{
namespace system
@@ -53,7 +63,7 @@ typedef std::shared_mutex mutex;
} // namespace system
} // namespace boost
-#else
+#else // defined(BOOST_SYSTEM_HAS_MSSTL_SHARED_MUTEX)
#include <mutex>
@@ -70,7 +80,8 @@ using std::mutex;
} // namespace system
} // namespace boost
-#endif
+#endif // defined(BOOST_SYSTEM_HAS_MSSTL_SHARED_MUTEX)
+#endif // defined(BOOST_SYSTEM_DISABLE_THREADS)
namespace boost
{
diff --git a/contrib/restricted/boost/system/include/boost/system/detail/requires_cxx11.hpp b/contrib/restricted/boost/system/include/boost/system/detail/requires_cxx11.hpp
index 1bf6a1f13f..40cf2c2a18 100644
--- a/contrib/restricted/boost/system/include/boost/system/detail/requires_cxx11.hpp
+++ b/contrib/restricted/boost/system/include/boost/system/detail/requires_cxx11.hpp
@@ -14,7 +14,7 @@
defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || \
defined(BOOST_NO_CXX11_HDR_SYSTEM_ERROR)
-BOOST_PRAGMA_MESSAGE("C++03 support is deprecated in Boost.System 1.82 and will be removed in Boost.System 1.84.")
+BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.System 1.82 and will be removed in Boost.System 1.84. Please open an issue in https://github.com/boostorg/system if you want it retained.")
#endif
diff --git a/contrib/restricted/boost/system/ya.make b/contrib/restricted/boost/system/ya.make
index b097df9843..4bb46ede03 100644
--- a/contrib/restricted/boost/system/ya.make
+++ b/contrib/restricted/boost/system/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(1.82.0)
+VERSION(1.83.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/system/archive/boost-1.82.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/system/archive/boost-1.83.0.tar.gz)
PEERDIR(
contrib/restricted/boost/assert