diff options
3 files changed, 7 insertions, 4 deletions
diff --git a/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/requires_cxx11.hpp b/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/requires_cxx11.hpp index f860bef568f..f1ed5f6b4e8 100644 --- a/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/requires_cxx11.hpp +++ b/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/requires_cxx11.hpp @@ -16,7 +16,7 @@ defined(BOOST_NO_CXX11_NULLPTR) || \ defined(BOOST_NO_CXX11_SMART_PTR) -BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.86.") +BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.87.") #endif diff --git a/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp b/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp index 2e15f7909e5..cf2d897da02 100644 --- a/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp +++ b/contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp @@ -17,8 +17,11 @@ // Defines the BOOST_SP_HAS_GCC_INTRINSICS macro if the __atomic_* // intrinsics are available. +// Libraries (e.g. Kokkos) sometimes define the __ATOMIC_RELAXED macros, +// leading to errors under MSVC (https://github.com/boostorg/smart_ptr/pull/112) -#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL ) +#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL ) \ + && !( defined(_MSC_VER) && !defined(__clang__) ) # define BOOST_SP_HAS_GCC_INTRINSICS diff --git a/contrib/restricted/boost/smart_ptr/ya.make b/contrib/restricted/boost/smart_ptr/ya.make index f815f37a57c..0d8a683580c 100644 --- a/contrib/restricted/boost/smart_ptr/ya.make +++ b/contrib/restricted/boost/smart_ptr/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.85.0) +VERSION(1.86.0) -ORIGINAL_SOURCE(https://github.com/boostorg/smart_ptr/archive/boost-1.85.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/smart_ptr/archive/boost-1.86.0.tar.gz) PEERDIR( contrib/restricted/boost/assert |