feedc0de/boost_static_string
1
0
Fork 0
forked from boostorg/static_string
Code Pull Requests Activity

Guard __has_builtin

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-02 11:53:21 -05:00
parent 497c84b5a1
commit 46a92fd8a4
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/boost/static_string/config.hpp
View File

@ -32,11 +32,18 @@
#endif #endif
#endif #endif
// Can we use __has_builtin?
#ifdef __has_builtin
#define BOOST_STATIC_STRING_HAS_BUILTIN(arg) __has_builtin(arg)
#else
#define BOOST_STATIC_STRING_HAS_BUILTIN(arg) 0
#endif
// Can we use is_constant_evaluated? // Can we use is_constant_evaluated?
// Standard version // Standard version
#if __cpp_lib_is_constant_evaluated >= 201811L #if __cpp_lib_is_constant_evaluated >= 201811L
#define BOOST_STATIC_STRING_IS_CONST_EVAL std::is_constant_evaluated() #define BOOST_STATIC_STRING_IS_CONST_EVAL std::is_constant_evaluated()
#elif defined(__clang__) && __has_builtin(__builtin_is_constant_evaluated) #elif defined(__clang__) && BOOST_STATIC_STRING_HAS_BUILTIN(__builtin_is_constant_evaluated)
// If we have clang version 9+, we can use the intrinsic // If we have clang version 9+, we can use the intrinsic
// While gcc also has this, we don't need it // While gcc also has this, we don't need it
#define BOOST_STATIC_STRING_IS_CONST_EVAL __builtin_is_constant_evaluated() #define BOOST_STATIC_STRING_IS_CONST_EVAL __builtin_is_constant_evaluated()
@ -53,6 +60,7 @@
#define BOOST_STATIC_STRING_NODISCARD #define BOOST_STATIC_STRING_NODISCARD
#endif #endif
// MSVC doesn't define __cplusplus by default // MSVC doesn't define __cplusplus by default
#ifdef _MSVC_LANG #ifdef _MSVC_LANG
#define BOOST_STATIC_STRING_STANDARD_VERSION _MSVC_LANG #define BOOST_STATIC_STRING_STANDARD_VERSION _MSVC_LANG
@ -160,11 +168,13 @@ defined(__clang__) && \
// that cannot use the library comparison function // that cannot use the library comparison function
// objects at all in constant expresssions. In these // objects at all in constant expresssions. In these
// cases, we use whatever will make more constexpr work. // cases, we use whatever will make more constexpr work.
#if defined(__clang__) && defined(__GLIBCXX__) && ((__GLIBCXX__ > 20181206 && __GLIBCXX__ <= 20190812)) #if defined(__clang__)
#if defined(__GLIBCXX__) && ((__GLIBCXX__ > 20181206 && __GLIBCXX__ <= 20190812))
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS #define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#elif __has_builtin(__builtin_constant_p) || defined(BOOST_STATIC_STRING_IS_CONST_EVAL) #elif BOOST_STATIC_STRING_HAS_BUILTIN(__builtin_constant_p) || defined(BOOST_STATIC_STRING_IS_CONST_EVAL)
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS #define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#endif #endif
#endif
namespace boost { namespace boost {
namespace static_string { namespace static_string {

2
include/boost/static_string/static_string.hpp
View File

@ -627,7 +627,7 @@ is_inside(
return true; return true;
return false; return false;
} }
#elif defined(__clang__) && __has_builtin(__builtin_constant_p) #elif defined(__clang__) && BOOST_STATIC_STRING_HAS_BUILTIN(__builtin_constant_p)
// We can also try using __builtin_constant_p // We can also try using __builtin_constant_p
if (__builtin_constant_p((ptr, src_first, src_last))) if (__builtin_constant_p((ptr, src_first, src_last)))
{ {