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

Merge branch 'develop' into feature/intrusive-ptr-tests

Browse Source
This commit is contained in:
Peter Dimov
2019-04-20 18:15:31 +03:00
parent 1725e26f70 4d0d81477c
commit 2a4aca403a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/atomic_sp_constexpr_test.cpp
View File

@ -18,10 +18,10 @@
BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_NO_CXX11_CONSTEXPR") BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_NO_CXX11_CONSTEXPR")
int main() {} int main() {}
#elif BOOST_WORKAROUND( BOOST_MSVC, < 1920 ) #elif BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
// MSVC does not implement static initialization for constexpr // MSVC does not implement static initialization for constexpr constructors
BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_MSVC < 1920") BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_MSVC < 1930")
int main() {} int main() {}
#elif defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR ) #elif defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR )

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, < 1920 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
# 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, < 1920 ) #if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
# undef HAVE_CONSTEXPR_INIT # undef HAVE_CONSTEXPR_INIT
#endif #endif