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

Remove UDLs on GCC before 4.9 to simplify things

Browse Source 
GCC before 4.9 rejects the syntax that is now
rejected on more modern compilers.
This commit is contained in:
Dana Jansens 2023-08-24 22:13:57 -04:00 committed by GitHub
parent b84b3bed47
commit a35c30e844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/fmt/format.h
View File

@ -155,18 +155,12 @@ FMT_END_NAMESPACE
// //
// GCC before 4.9 requires a space in `operator"" _a` which is invalid in later // GCC before 4.9 requires a space in `operator"" _a` which is invalid in later
// compiler versions. // compiler versions.
# if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 407 || \ # if (FMT_HAS_FEATURE(cxx_user_literals) || FMT_GCC_VERSION >= 409 || \
FMT_MSC_VERSION >= 1900) && \ FMT_MSC_VERSION >= 1900) && \
(!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480) (!defined(__EDG_VERSION__) || __EDG_VERSION__ >= /* UDL feature */ 480)
# define FMT_USE_USER_DEFINED_LITERALS 1 # define FMT_USE_USER_DEFINED_LITERALS 1
# if FMT_GCC_VERSION > 0 && FMT_GCC_VERSION < 409
# define FMT_WHITESPACE_IN_USER_DEFINED_LITERALS 1
# else
# define FMT_WHITESPACE_IN_USER_DEFINED_LITERALS 0
# endif
# else # else
# define FMT_USE_USER_DEFINED_LITERALS 0 # define FMT_USE_USER_DEFINED_LITERALS 0
# define FMT_WHITESPACE_IN_USER_DEFINED_LITERALS 0
# endif # endif
#endif #endif
@ -4436,10 +4430,6 @@ template <detail_exported::fixed_string Str> constexpr auto operator""_a() {
using char_t = remove_cvref_t<decltype(Str.data[0])>; using char_t = remove_cvref_t<decltype(Str.data[0])>;
return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>(); return detail::udl_arg<char_t, sizeof(Str.data) / sizeof(char_t), Str>();
} }
# elif FMT_WHITESPACE_IN_USER_DEFINED_LITERALS
constexpr auto operator"" _a(const char* s, size_t) -> detail::udl_arg<char> {
return {s};
}
# else # else
constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> { constexpr auto operator""_a(const char* s, size_t) -> detail::udl_arg<char> {
return {s}; return {s};