File tree Expand file tree Collapse file tree 3 files changed +7
-4
lines changed
contrib/restricted/boost/smart_ptr
include/boost/smart_ptr/detail Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 16
16
defined(BOOST_NO_CXX11_NULLPTR) || \
17
17
defined(BOOST_NO_CXX11_SMART_PTR)
18
18
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 ." )
20
20
21
21
#endif
22
22
Original file line number Diff line number Diff line change 17
17
// Defines the BOOST_SP_HAS_GCC_INTRINSICS macro if the __atomic_*
18
18
// intrinsics are available.
19
19
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)
20
22
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__) )
22
25
23
26
# define BOOST_SP_HAS_GCC_INTRINSICS
24
27
Original file line number Diff line number Diff line change @@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
6
6
7
7
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
8
8
9
- VERSION(1.85 .0)
9
+ VERSION(1.86 .0)
10
10
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)
12
12
13
13
PEERDIR(
14
14
contrib/restricted/boost/assert
You can’t perform that action at this time.
0 commit comments