diff --git a/include/fmt/core.h b/include/fmt/core.h index f71fdb01..5ba58e1a 100644 --- a/include/fmt/core.h +++ b/include/fmt/core.h @@ -674,12 +674,11 @@ template struct custom_value { Context& ctx); }; -template -struct is_formattable { +template struct is_formattable { enum { - value = !is_constructible< - typename Context::template formatter_type::type, - internal::dummy_formatter_arg>::value + value = + !is_constructible::type, + internal::dummy_formatter_arg>::value }; }; diff --git a/include/fmt/format.h b/include/fmt/format.h index 669f4bfe..56ce8878 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -2137,9 +2137,9 @@ FMT_CONSTEXPR const typename ParseContext::char_type* parse_format_specs( ParseContext& ctx) { // GCC 7.2 requires initializer. typedef typename ParseContext::char_type char_type; - typename std::conditional< - is_formattable::value, - formatter, internal::fallback_formatter>::type f; + typename std::conditional::value, + formatter, + internal::fallback_formatter>::type f; return f.parse(ctx); }