aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2022-08-11 13:53:36 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2022-08-11 13:53:36 +0300
commit2e89520e2b7de06b4bb85bf99cf70efd28dda2bf (patch)
treea794f8a4690cf331d049b49057bd4c0496ea76b7
parent3472ded2efb9874cae15788b0830ede1e274be5c (diff)
downloadydb-2e89520e2b7de06b4bb85bf99cf70efd28dda2bf.tar.gz
Update contrib/restricted/boost/atomic to 1.80.0
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/atomic_ref.hpp4
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch32.hpp9
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch64.hpp9
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_arm.hpp9
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/detail/config.hpp4
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/detail/type_traits/has_unique_object_representations.hpp2
-rw-r--r--contrib/restricted/boost/atomic/include/boost/atomic/ipc_atomic_ref.hpp4
7 files changed, 29 insertions, 12 deletions
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/atomic_ref.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/atomic_ref.hpp
index 02090d51fb..dc388f0d2d 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/atomic_ref.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/atomic_ref.hpp
@@ -74,10 +74,10 @@ public:
BOOST_DELETED_FUNCTION(atomic_ref& operator= (atomic_ref const&))
};
-#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX17_DEDUCTION_GUIDES)
+#if !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
template< typename T >
atomic_ref(T&) -> atomic_ref< T >;
-#endif // !defined(BOOST_ATOMIC_DETAIL_NO_CXX17_DEDUCTION_GUIDES)
+#endif // !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
//! Atomic reference factory function
template< typename T >
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch32.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch32.hpp
index 390ccd2e03..769a546d37 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch32.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch32.hpp
@@ -3,7 +3,7 @@
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
- * Copyright (c) 2020 Andrey Semashev
+ * Copyright (c) 2020, 2022 Andrey Semashev
*/
/*!
* \file atomic/detail/caps_arch_gcc_aarch32.hpp
@@ -31,8 +31,15 @@
(defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
#define BOOST_ATOMIC_DETAIL_AARCH32_BIG_ENDIAN
#else
+#include <boost/predef/other/endian.h>
+#if BOOST_ENDIAN_LITTLE_BYTE
+#define BOOST_ATOMIC_DETAIL_AARCH32_LITTLE_ENDIAN
+#elif BOOST_ENDIAN_BIG_BYTE
+#define BOOST_ATOMIC_DETAIL_AARCH32_BIG_ENDIAN
+#else
#error "Boost.Atomic: Failed to determine AArch32 endianness, the target platform is not supported. Please, report to the developers (patches are welcome)."
#endif
+#endif
#define BOOST_ATOMIC_INT8_LOCK_FREE 2
#define BOOST_ATOMIC_INT16_LOCK_FREE 2
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch64.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch64.hpp
index 1579a8e8bd..d486b10f6a 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch64.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_aarch64.hpp
@@ -3,7 +3,7 @@
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
- * Copyright (c) 2020 Andrey Semashev
+ * Copyright (c) 2020, 2022 Andrey Semashev
*/
/*!
* \file atomic/detail/caps_arch_gcc_aarch64.hpp
@@ -31,8 +31,15 @@
(defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
#define BOOST_ATOMIC_DETAIL_AARCH64_BIG_ENDIAN
#else
+#include <boost/predef/other/endian.h>
+#if BOOST_ENDIAN_LITTLE_BYTE
+#define BOOST_ATOMIC_DETAIL_AARCH64_LITTLE_ENDIAN
+#elif BOOST_ENDIAN_BIG_BYTE
+#define BOOST_ATOMIC_DETAIL_AARCH64_BIG_ENDIAN
+#else
#error "Boost.Atomic: Failed to determine AArch64 endianness, the target platform is not supported. Please, report to the developers (patches are welcome)."
#endif
+#endif
#if defined(__ARM_FEATURE_ATOMICS)
// ARMv8.1 added Large System Extensions, which includes cas, swp, and a number of other read-modify-write instructions
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_arm.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_arm.hpp
index 8c697c9760..0e3b219172 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_arm.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/caps_arch_gcc_arm.hpp
@@ -7,7 +7,7 @@
* Copyright (c) 2009 Phil Endecott
* Copyright (c) 2013 Tim Blechmann
* ARM Code by Phil Endecott, based on other architectures.
- * Copyright (c) 2014, 2020 Andrey Semashev
+ * Copyright (c) 2014, 2020, 2022 Andrey Semashev
*/
/*!
* \file atomic/detail/caps_arch_gcc_arm.hpp
@@ -36,8 +36,15 @@
(defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__))
#define BOOST_ATOMIC_DETAIL_ARM_BIG_ENDIAN
#else
+#include <boost/predef/other/endian.h>
+#if BOOST_ENDIAN_LITTLE_BYTE
+#define BOOST_ATOMIC_DETAIL_ARM_LITTLE_ENDIAN
+#elif BOOST_ENDIAN_BIG_BYTE
+#define BOOST_ATOMIC_DETAIL_ARM_BIG_ENDIAN
+#else
#error "Boost.Atomic: Failed to determine ARM endianness, the target platform is not supported. Please, report to the developers (patches are welcome)."
#endif
+#endif
#if defined(__GNUC__) && defined(__arm__) && (BOOST_ATOMIC_DETAIL_ARM_ARCH >= 6)
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/config.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/config.hpp
index b2031d8d43..1e9f1bb1a9 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/config.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/config.hpp
@@ -69,10 +69,6 @@
#define BOOST_ATOMIC_DETAIL_NO_CXX11_CONSTEXPR_UNION_INIT
#endif
-#if (defined(_MSC_VER) && (_MSC_VER < 1914 || _MSVC_LANG < 201703)) || (!defined(_MSC_VER) && (!defined(__cpp_deduction_guides) || __cpp_deduction_guides < 201606))
-#define BOOST_ATOMIC_DETAIL_NO_CXX17_DEDUCTION_GUIDES
-#endif
-
#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX11_CONSTEXPR_UNION_INIT)
#define BOOST_ATOMIC_DETAIL_CONSTEXPR_UNION_INIT BOOST_CONSTEXPR
#else
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/type_traits/has_unique_object_representations.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/type_traits/has_unique_object_representations.hpp
index 8c72f15ea3..bdd10f988a 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/type_traits/has_unique_object_representations.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/type_traits/has_unique_object_representations.hpp
@@ -24,7 +24,7 @@
#endif
#if (defined(__cpp_lib_has_unique_object_representations) && __cpp_lib_has_unique_object_representations >= 201606) || \
- (defined(_CPPLIB_VER) && _CPPLIB_VER >= 650 && defined(_HAS_CXX17) && _HAS_CXX17 != 0)
+ (defined(_CPPLIB_VER) && _CPPLIB_VER >= 650 && defined(_MSVC_STL_VERSION) && _MSVC_STL_VERSION >= 141 && defined(_HAS_CXX17) && _HAS_CXX17 != 0)
namespace boost {
namespace atomics {
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/ipc_atomic_ref.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/ipc_atomic_ref.hpp
index eddb0cb09d..9a8df18712 100644
--- a/contrib/restricted/boost/atomic/include/boost/atomic/ipc_atomic_ref.hpp
+++ b/contrib/restricted/boost/atomic/include/boost/atomic/ipc_atomic_ref.hpp
@@ -74,10 +74,10 @@ public:
BOOST_DELETED_FUNCTION(ipc_atomic_ref& operator= (ipc_atomic_ref const&))
};
-#if !defined(BOOST_ATOMIC_DETAIL_NO_CXX17_DEDUCTION_GUIDES)
+#if !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
template< typename T >
ipc_atomic_ref(T&) -> ipc_atomic_ref< T >;
-#endif // !defined(BOOST_ATOMIC_DETAIL_NO_CXX17_DEDUCTION_GUIDES)
+#endif // !defined(BOOST_NO_CXX17_DEDUCTION_GUIDES)
//! IPC atomic reference factory function
template< typename T >