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

Adjust FMT_STRING_RESULT check to gcc 8.4.

Browse Source
This commit is contained in:
Dair Grant 2020-03-07 01:46:25 +00:00
parent d94558359a
commit f2d92931ce
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/fmt/compile.h
View File

@ -542,7 +542,7 @@ constexpr auto compile(S format_str) -> internal::compiled_format<S, Args...> {
# endif // __cpp_if_constexpr # endif // __cpp_if_constexpr
#endif // FMT_USE_CONSTEXPR #endif // FMT_USE_CONSTEXPR
// Compiles the format string which must be a string literal or view. // Compiles the format string which must be a string literal.
template <typename... Args, typename Char, size_t N> template <typename... Args, typename Char, size_t N>
auto compile(const Char (&format_str)[N]) auto compile(const Char (&format_str)[N])
-> internal::compiled_format<const Char*, Args...> { -> internal::compiled_format<const Char*, Args...> {
@ -550,13 +550,6 @@ auto compile(const Char (&format_str)[N])
basic_string_view<Char>(format_str, N - 1)); basic_string_view<Char>(format_str, N - 1));
} }
template <typename Char>
auto compile(const basic_string_view<Char>& format_str)
-> internal::compiled_format<const Char*> {
return internal::compiled_format<const Char*>(
format_str);
}
template <typename CompiledFormat, typename... Args, template <typename CompiledFormat, typename... Args,
typename Char = typename CompiledFormat::char_type, typename Char = typename CompiledFormat::char_type,
FMT_ENABLE_IF(std::is_base_of<internal::basic_compiled_format, FMT_ENABLE_IF(std::is_base_of<internal::basic_compiled_format,

2
include/fmt/format.h
View File

@ -3544,7 +3544,7 @@ FMT_CONSTEXPR internal::udl_arg<wchar_t> operator"" _a(const wchar_t* s,
#endif // FMT_USE_USER_DEFINED_LITERALS #endif // FMT_USE_USER_DEFINED_LITERALS
FMT_END_NAMESPACE FMT_END_NAMESPACE
#if FMT_GCC_VERSION >= 800 #if FMT_GCC_VERSION >= 840
# define FMT_STRING_RESULT(s) ()->fmt::basic_string_view<fmt::remove_cvref_t<decltype(*s)>> # define FMT_STRING_RESULT(s) ()->fmt::basic_string_view<fmt::remove_cvref_t<decltype(*s)>>
#else #else
# define FMT_STRING_RESULT(s) # define FMT_STRING_RESULT(s)