Skip to content

Commit 9424b3c

Browse files
committed
Update contrib/restricted/boost/smart_ptr to 1.86.0
a2c030e4658166d4aaf432632b50891e6ce35c7b
1 parent f24ca00 commit 9424b3c

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/requires_cxx11.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
defined(BOOST_NO_CXX11_NULLPTR) || \
1717
defined(BOOST_NO_CXX11_SMART_PTR)
1818

19-
BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.86.")
19+
BOOST_PRAGMA_MESSAGE("C++03 support was deprecated in Boost.SmartPtr 1.82 and will be removed in Boost.SmartPtr 1.87.")
2020

2121
#endif
2222

contrib/restricted/boost/smart_ptr/include/boost/smart_ptr/detail/sp_has_gcc_intrinsics.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,11 @@
1717
// Defines the BOOST_SP_HAS_GCC_INTRINSICS macro if the __atomic_*
1818
// intrinsics are available.
1919

20+
// Libraries (e.g. Kokkos) sometimes define the __ATOMIC_RELAXED macros,
21+
// leading to errors under MSVC (https://github.com/boostorg/smart_ptr/pull/112)
2022

21-
#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL )
23+
#if defined( __ATOMIC_RELAXED ) && defined( __ATOMIC_ACQUIRE ) && defined( __ATOMIC_RELEASE ) && defined( __ATOMIC_ACQ_REL ) \
24+
&& !( defined(_MSC_VER) && !defined(__clang__) )
2225

2326
# define BOOST_SP_HAS_GCC_INTRINSICS
2427

contrib/restricted/boost/smart_ptr/ya.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(1.85.0)
9+
VERSION(1.86.0)
1010

11-
ORIGINAL_SOURCE(https://github.com/boostorg/smart_ptr/archive/boost-1.85.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/boostorg/smart_ptr/archive/boost-1.86.0.tar.gz)
1212

1313
PEERDIR(
1414
contrib/restricted/boost/assert

0 commit comments

Comments
 (0)