External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add stdlib version check for C++20 (#3754)

Browse Source 
Signed-off-by: Vladislav Shchapov <vladislav@shchapov.ru>
This commit is contained in:
Vladislav Shchapov 2023-12-17 21:33:17 +05:00 committed by GitHub
parent afa85e46c3
commit 923005bd4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/fmt/core.h
View File

@ -105,9 +105,12 @@
# define FMT_CONSTEXPR # define FMT_CONSTEXPR
#endif #endif
#if ((FMT_CPLUSPLUS >= 202002L) && \ #if (FMT_CPLUSPLUS >= 202002L || \
(!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9)) || \ (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) && \
(FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002) ((!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 10) && \
(!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
(!FMT_MSC_VERSION || FMT_MSC_VERSION >= 1928)) && \
defined(__cpp_lib_is_constant_evaluated)
# define FMT_CONSTEXPR20 constexpr # define FMT_CONSTEXPR20 constexpr
#else #else
# define FMT_CONSTEXPR20 # define FMT_CONSTEXPR20

15
test/compile-test.cc
View File

@ -280,15 +280,18 @@ TEST(compile_test, compile_format_string_literal) {
#endif #endif
// MSVS 2019 19.29.30145.0 - Support C++20 and OK. // MSVS 2019 19.29.30145.0 - Support C++20 and OK.
// MSVS 2022 19.32.31332.0 - compile-test.cc(362,3): fatal error C1001: Internal // MSVS 2022 19.32.31332.0, 19.37.32826.1 - compile-test.cc(362,3): fatal error
// compiler error. // C1001: Internal compiler error.
// (compiler file // (compiler file
// 'D:\a\_work\1\s\src\vctools\Compiler\CxxFE\sl\p1\c\constexpr\constexpr.cpp', // 'D:\a\_work\1\s\src\vctools\Compiler\CxxFE\sl\p1\c\constexpr\constexpr.cpp',
// line 8635) // line 8635)
#if ((FMT_CPLUSPLUS >= 202002L) && \ #if (FMT_CPLUSPLUS >= 202002L || \
(!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE > 9) && \ (FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002)) && \
(!FMT_MSC_VERSION || FMT_MSC_VERSION < 1930)) || \ ((!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 10) && \
(FMT_CPLUSPLUS >= 201709L && FMT_GCC_VERSION >= 1002) (!defined(_LIBCPP_VERSION) || _LIBCPP_VERSION >= 10000) && \
(!FMT_MSC_VERSION || \
(FMT_MSC_VERSION >= 1928 && FMT_MSC_VERSION < 1930))) && \
defined(__cpp_lib_is_constant_evaluated)
template <size_t max_string_length, typename Char = char> struct test_string { template <size_t max_string_length, typename Char = char> struct test_string {
template <typename T> constexpr bool operator==(const T& rhs) const noexcept { template <typename T> constexpr bool operator==(const T& rhs) const noexcept {
return fmt::basic_string_view<Char>(rhs).compare(buffer) == 0; return fmt::basic_string_view<Char>(rhs).compare(buffer) == 0;