boostorg/static_string
1
0
Fork 1
mirror of https://github.com/boostorg/static_string.git synced 2025-07-29 20:17:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove __builtin_constant_p

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-02 12:15:51 -05:00
parent 46a92fd8a4
commit 9a4e96a905
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,6 @@
#define BOOST_STATIC_STRING_NODISCARD
#endif
// MSVC doesn't define __cplusplus by default
#ifdef _MSVC_LANG
#define BOOST_STATIC_STRING_STANDARD_VERSION _MSVC_LANG
@ -168,12 +167,9 @@ defined(__clang__) && \
// that cannot use the library comparison function
// objects at all in constant expresssions. In these
// cases, we use whatever will make more constexpr work.
#if defined(__clang__)
#if defined(__GLIBCXX__) && ((__GLIBCXX__ > 20181206 && __GLIBCXX__ <= 20190812))
#if defined(__clang__) && defined(__GLIBCXX__) && \
((__GLIBCXX__ >= 20180726 && __GLIBCXX__ <= 20190812))
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#elif BOOST_STATIC_STRING_HAS_BUILTIN(__builtin_constant_p) || defined(BOOST_STATIC_STRING_IS_CONST_EVAL)
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#endif
#endif
namespace boost {

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

@ -627,15 +627,6 @@ is_inside(
return true;
return false;
}
#elif defined(__clang__) && BOOST_STATIC_STRING_HAS_BUILTIN(__builtin_constant_p)
// We can also try using __builtin_constant_p
if (__builtin_constant_p((ptr, src_first, src_last)))
{
for (; src_first != src_last; ++src_first)
if (src_first == ptr)
return true;
return false;
}
#else
// If library comparison functions don't work, and
// we cannot use any of the above, we can use