Update sp_constexpr_test, sp_constexpr_test2

boostorg · Sep 25, 2024 · 38d5403 · 38d5403
1 parent 8863958
commit 38d5403
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/test/sp_constexpr_test.cpp b/test/sp_constexpr_test.cpp
@@ -10,26 +10,26 @@
 
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
+#include <boost/config/pragma_message.hpp>
+#include <boost/config/helper_macros.hpp>
 
-#define HAVE_CONSTEXPR_INIT
+#if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+// MSVC does not implement static initialization for constexpr constructors
+BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_MSVC < 1930")
+int main() {}
 
-#if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+#elif defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR )
 
-#if defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+// Clang only implements static initialization for constexpr in C++14 mode
+BOOST_PRAGMA_MESSAGE("Skipping test due to __clang__ and BOOST_NO_CXX14_CONSTEXPR")
+int main() {}
 
-#if !defined( HAVE_CONSTEXPR_INIT )
+#elif defined( _LIBCPP_VERSION ) && ( _LIBCPP_VERSION < 6000 )
 
-int main()
-{
-}
+// in libc++, atomic_flag has a non-constexpr constructor from bool
+BOOST_PRAGMA_MESSAGE("Skipping test due to _LIBCPP_VERSION " BOOST_STRINGIZE(_LIBCPP_VERSION))
+int main() {}
 
 #else
 

diff --git a/test/sp_constexpr_test2.cpp b/test/sp_constexpr_test2.cpp
@@ -10,26 +10,26 @@
 
 #include <boost/config.hpp>
 #include <boost/config/workaround.hpp>
+#include <boost/config/pragma_message.hpp>
+#include <boost/config/helper_macros.hpp>
 
-#define HAVE_CONSTEXPR_INIT
+#if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
 
-#if defined( BOOST_NO_CXX11_CONSTEXPR )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+// MSVC does not implement static initialization for constexpr constructors
+BOOST_PRAGMA_MESSAGE("Skipping test due to BOOST_MSVC < 1930")
+int main() {}
 
-#if BOOST_WORKAROUND( BOOST_MSVC, < 1930 )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+#elif defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR )
 
-#if defined(__clang__) && defined( BOOST_NO_CXX14_CONSTEXPR )
-# undef HAVE_CONSTEXPR_INIT
-#endif
+// Clang only implements static initialization for constexpr in C++14 mode
+BOOST_PRAGMA_MESSAGE("Skipping test due to __clang__ and BOOST_NO_CXX14_CONSTEXPR")
+int main() {}
 
-#if !defined( HAVE_CONSTEXPR_INIT )
+#elif defined( _LIBCPP_VERSION ) && ( _LIBCPP_VERSION < 6000 )
 
-int main()
-{
-}
+// in libc++, atomic_flag has a non-constexpr constructor from bool
+BOOST_PRAGMA_MESSAGE("Skipping test due to _LIBCPP_VERSION " BOOST_STRINGIZE(_LIBCPP_VERSION))
+int main() {}
 
 #else