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

Update travis

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-02 12:49:30 -05:00
parent 9a4e96a905
commit c378689de2
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -240,7 +240,7 @@ jobs:
- { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-6.0", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-6 } - { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-6.0", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-6 }
- { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-7", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-7 } - { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-7", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-7 }
- { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-8", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-8 } - { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-8", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-8 }
- { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-9", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ], addons: *clang-9 } - { os: "linux", env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang-9", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17", "B2_CXXFLAGS=-stdlib=libc++"] , addons: *clang-9 }
- { os: "osx" , env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ] } - { os: "osx" , env: [ "COMMENT=STANDALONE", "B2_TOOLSET=clang", "B2_DEFINES=define=BOOST_STATIC_STRING_STANDALONE", "B2_CXXSTD=17" ] }
notifications: notifications:

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

@ -168,7 +168,7 @@ defined(__clang__) && \
// 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__) && \ #if defined(__clang__) && defined(__GLIBCXX__) && \
((__GLIBCXX__ >= 20180726 && __GLIBCXX__ <= 20190812)) (__GLIBCXX__ >= 20180726 && __GLIBCXX__ <= 20190812)
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS #define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#endif #endif
@ -185,5 +185,4 @@ using basic_string_view =
#endif #endif
} // static_string } // static_string
} // boost } // boost
#endif #endif

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

@ -614,8 +614,7 @@ is_inside(
// of conformance, we will settle for the best option that is available. // of conformance, we will settle for the best option that is available.
// We don't care about this in C++11, since this function would have // We don't care about this in C++11, since this function would have
// no applications in constant expressions. // no applications in constant expressions.
#ifdef BOOST_STATIC_STRING_CPP14 #if defined(BOOST_STATIC_STRING_CPP14) && defined(BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS)
#ifdef BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS
#ifdef BOOST_STATIC_STRING_IS_CONST_EVAL #ifdef BOOST_STATIC_STRING_IS_CONST_EVAL
// Our second best option is to use is_constant_evaluated // Our second best option is to use is_constant_evaluated
// and a loop that checks for equality, since equality for // and a loop that checks for equality, since equality for
@ -633,7 +632,6 @@ is_inside(
// try builtin comparison operators instead. // try builtin comparison operators instead.
return ptr >= src_first && ptr < src_last; return ptr >= src_first && ptr < src_last;
#endif #endif
#endif
#endif #endif
// Use the library comparison functions if we can't use // Use the library comparison functions if we can't use
// is_constant_evaluated or if we don't need to. // is_constant_evaluated or if we don't need to.