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

Issue #2816: also strip named-arg for the fallback formatter

Browse Source
This commit is contained in:
timsong-cpp 2022-03-18 09:23:06 -05:00 committed by Victor Zverovich
parent 4ad90578f7
commit ac0d9d5fe2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/fmt/core.h
View File

@ -2665,13 +2665,14 @@ FMT_CONSTEXPR auto parse_format_specs(ParseContext& ctx)
-> decltype(ctx.begin()) { -> decltype(ctx.begin()) {
using char_type = typename ParseContext::char_type; using char_type = typename ParseContext::char_type;
using context = buffer_context<char_type>; using context = buffer_context<char_type>;
using stripped_type = typename strip_named_arg<T>::type;
using mapped_type = conditional_t< using mapped_type = conditional_t<
mapped_type_constant<T, context>::value != type::custom_type, mapped_type_constant<T, context>::value != type::custom_type,
decltype(arg_mapper<context>().map(std::declval<const T&>())), decltype(arg_mapper<context>().map(std::declval<const T&>())),
typename strip_named_arg<T>::type>; stripped_type>;
auto f = conditional_t<has_formatter<mapped_type, context>::value, auto f = conditional_t<has_formatter<mapped_type, context>::value,
formatter<mapped_type, char_type>, formatter<mapped_type, char_type>,
fallback_formatter<T, char_type>>(); fallback_formatter<stripped_type, char_type>>();
return f.parse(ctx); return f.parse(ctx);
} }