eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace 201703L with 201402L, for c++1z and 17

Browse Source
This commit is contained in:
o-micron 2020-03-10 03:04:41 +02:00
parent aa35abcd04
commit e83e5fb7ee
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
googletest/include/gtest/internal/gtest-port.h
View File

@ -2235,7 +2235,7 @@ using StringView = ::absl::string_view;
} // namespace testing } // namespace testing
#else #else
#ifdef __has_include #ifdef __has_include
#if __has_include(<string_view>) && __cplusplus >= 201703L #if __has_include(<string_view>) && __cplusplus > 201402L
// Otherwise for C++17 and higher use std::string_view for Matcher<> // Otherwise for C++17 and higher use std::string_view for Matcher<>
// specializations. // specializations.
# define GTEST_INTERNAL_HAS_STRING_VIEW 1 # define GTEST_INTERNAL_HAS_STRING_VIEW 1
@ -2247,9 +2247,12 @@ using StringView = ::absl::string_view;
} // namespace testing } // namespace testing
// The case where absl is configured NOT to alias std::string_view is not // The case where absl is configured NOT to alias std::string_view is not
// supported. // supported.
# endif // __has_include(<string_view>) && __cplusplus >= 201703L # endif // __has_include(<string_view>) && __cplusplus > 201402L
#else // well, what if __has_include is not supported by the compiler ? that may be the case with older msvc ? #else
#if __cplusplus >= 201703L // well, what if __has_include is not supported by the compiler ? that may be the case with older msvc ?
// it might not make sense to actually check for that, since string_view is available from c++17
// but uh, let me fix msvc tests for now
#if __cplusplus > 201402L
// Otherwise for C++17 and higher use std::string_view for Matcher<> // Otherwise for C++17 and higher use std::string_view for Matcher<>
// specializations. // specializations.
# define GTEST_INTERNAL_HAS_STRING_VIEW 1 # define GTEST_INTERNAL_HAS_STRING_VIEW 1