clang format

This commit is contained in:
Victor Zverovich 2019-03-21 20:51:37 -07:00
parent da0ea4161a
commit b7e6bf9671
2 changed files with 7 additions and 8 deletions

View File

@ -674,11 +674,10 @@ template <typename Context> struct custom_value {
Context& ctx); Context& ctx);
}; };
template <typename T, typename Context> template <typename T, typename Context> struct is_formattable {
struct is_formattable {
enum { enum {
value = !is_constructible< value =
typename Context::template formatter_type<T>::type, !is_constructible<typename Context::template formatter_type<T>::type,
internal::dummy_formatter_arg>::value internal::dummy_formatter_arg>::value
}; };
}; };

View File

@ -2137,9 +2137,9 @@ FMT_CONSTEXPR const typename ParseContext::char_type* parse_format_specs(
ParseContext& ctx) { ParseContext& ctx) {
// GCC 7.2 requires initializer. // GCC 7.2 requires initializer.
typedef typename ParseContext::char_type char_type; typedef typename ParseContext::char_type char_type;
typename std::conditional< typename std::conditional<is_formattable<T, format_context>::value,
is_formattable<T, format_context>::value, formatter<T, char_type>,
formatter<T, char_type>, internal::fallback_formatter<T, char_type>>::type f; internal::fallback_formatter<T, char_type>>::type f;
return f.parse(ctx); return f.parse(ctx);
} }