feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Peter Dimov
2017-08-29 00:44:14 +03:00
parent 06bd43d5b5 bcfe1be681
commit 10c6233029
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/smart_ptr/detail/local_counted_base.hpp
View File

@ -60,12 +60,14 @@ public:
void add_ref() BOOST_SP_NOEXCEPT void add_ref() BOOST_SP_NOEXCEPT
{ {
#if !defined(__NVCC__)
#if defined( __has_builtin ) #if defined( __has_builtin )
# if __has_builtin( __builtin_assume ) # if __has_builtin( __builtin_assume )
__builtin_assume( local_use_count_ >= 1 ); __builtin_assume( local_use_count_ >= 1 );
# endif # endif
#endif
#endif #endif
local_use_count_ = static_cast<count_type>( local_use_count_ + 1 ); local_use_count_ = static_cast<count_type>( local_use_count_ + 1 );

2
test/atomic_sp_constexpr_test.cpp
View File

@ -17,7 +17,7 @@
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif
#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1920 )
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif

2
test/sp_constexpr_test.cpp
View File

@ -17,7 +17,7 @@
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif
#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1920 )
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif

2
test/sp_constexpr_test2.cpp
View File

@ -17,7 +17,7 @@
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif
#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1920 )
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif