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

Fix macro guarding test traits

Browse Source
This commit is contained in:
Krystian Stasiowski
2020-02-01 21:24:46 -05:00
parent 2fe445f634
commit 4d8d35acc8
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,8 @@ defined(__clang__) && \
#define BOOST_STATIC_STRING_CPP14_CONSTEXPR #define BOOST_STATIC_STRING_CPP14_CONSTEXPR
#endif #endif
//(defined(_MSVC_LANG) && BOOST_STATIC_STRING_STANDARD_VERSION < 201703L) // For clang and msvc, constexpr does not work with library
// comparison function objects.
#if (defined(__clang__) && (__clang_major__ < 9)) || \ #if (defined(__clang__) && (__clang_major__ < 9)) || \
(defined(_MSVC_LANG) && !defined(BOOST_STATIC_STRING_CPP20)) (defined(_MSVC_LANG) && !defined(BOOST_STATIC_STRING_CPP20))
#define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS #define BOOST_STATIC_STRING_NO_PTR_COMP_FUNCTIONS

2
test/constexpr_tests.hpp
View File

@ -11,7 +11,7 @@
#include <boost/static_string/static_string.hpp> #include <boost/static_string/static_string.hpp>
// char_traits aren't constexpr until c++17 // char_traits aren't constexpr until c++17
#if BOOST_STATIC_STRING_STANDARD_VERSION <= 201703L #ifdef BOOST_STATIC_STRING_CPP14
struct cxper_char_traits struct cxper_char_traits
{ {
using char_type = char; using char_type = char;