diff --git a/include/boost/smart_ptr/detail/local_counted_base.hpp b/include/boost/smart_ptr/detail/local_counted_base.hpp index 398b46d..fdfe2c6 100644 --- a/include/boost/smart_ptr/detail/local_counted_base.hpp +++ b/include/boost/smart_ptr/detail/local_counted_base.hpp @@ -60,12 +60,14 @@ public: void add_ref() BOOST_SP_NOEXCEPT { +#if !defined(__NVCC__) #if defined( __has_builtin ) # if __has_builtin( __builtin_assume ) __builtin_assume( local_use_count_ >= 1 ); # endif +#endif #endif local_use_count_ = static_cast( local_use_count_ + 1 ); diff --git a/test/atomic_sp_constexpr_test.cpp b/test/atomic_sp_constexpr_test.cpp index d81822d..f6e7248 100644 --- a/test/atomic_sp_constexpr_test.cpp +++ b/test/atomic_sp_constexpr_test.cpp @@ -17,7 +17,7 @@ # undef HAVE_CONSTEXPR_INIT #endif -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) # undef HAVE_CONSTEXPR_INIT #endif diff --git a/test/sp_constexpr_test.cpp b/test/sp_constexpr_test.cpp index 7238e26..38c96f4 100644 --- a/test/sp_constexpr_test.cpp +++ b/test/sp_constexpr_test.cpp @@ -17,7 +17,7 @@ # undef HAVE_CONSTEXPR_INIT #endif -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) # undef HAVE_CONSTEXPR_INIT #endif diff --git a/test/sp_constexpr_test2.cpp b/test/sp_constexpr_test2.cpp index e508fa1..dd6e4ac 100644 --- a/test/sp_constexpr_test2.cpp +++ b/test/sp_constexpr_test2.cpp @@ -17,7 +17,7 @@ # undef HAVE_CONSTEXPR_INIT #endif -#if BOOST_WORKAROUND( BOOST_MSVC, <= 1910 ) +#if BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) # undef HAVE_CONSTEXPR_INIT #endif