From 7977c2b4d08eca9f2fb97e2e05c3db2096d6fe54 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Tue, 27 Oct 2020 07:19:28 -0700 Subject: [PATCH] Cleanup --- include/fmt/color.h | 8 ++++---- include/fmt/compile.h | 15 ++++++++------- include/fmt/format.h | 15 +++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/include/fmt/color.h b/include/fmt/color.h index e89d4e3a..94e3419d 100644 --- a/include/fmt/color.h +++ b/include/fmt/color.h @@ -589,10 +589,10 @@ OutputIt vformat_to( \endrst */ template >::value&& - detail::is_string::value)> -inline auto format_to(OutputIt out, const text_style& ts, - const S& format_str, Args&&... args) -> + bool enable = detail::is_output_iterator>::value&& + detail::is_string::value> +inline auto format_to(OutputIt out, const text_style& ts, const S& format_str, + Args&&... args) -> typename std::enable_if::type { return vformat_to(out, ts, to_string_view(format_str), fmt::make_args_checked(format_str, args...)); diff --git a/include/fmt/compile.h b/include/fmt/compile.h index 8b79a530..3a33b020 100644 --- a/include/fmt/compile.h +++ b/include/fmt/compile.h @@ -668,13 +668,14 @@ OutputIt format_to(OutputIt out, const S&, const Args&... args) { } template -typename std::enable_if<(detail::is_output_iterator< - OutputIt, typename CompiledFormat::char_type>::value&& - std::is_base_of::value), - format_to_n_result ->::type format_to_n(OutputIt out, size_t n, - const CompiledFormat& cf, const Args&... args) { +auto format_to_n(OutputIt out, size_t n, const CompiledFormat& cf, + const Args&... args) -> + typename std::enable_if< + detail::is_output_iterator::value && + std::is_base_of::value, + format_to_n_result>::type { auto it = format_to(detail::truncating_iterator(out, n), cf, args...); return {it.base(), it.count()}; diff --git a/include/fmt/format.h b/include/fmt/format.h index fbe50450..6b03e857 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -3056,8 +3056,7 @@ struct format_handler : detail::error_handler { basic_format_parse_context parse_context; Context context; - format_handler(OutputIt out, - basic_string_view str, + format_handler(OutputIt out, basic_string_view str, basic_format_args format_args, detail::locale_ref loc) : parse_context(str), context(out, format_args, loc) {} @@ -3080,8 +3079,8 @@ struct format_handler : detail::error_handler { FMT_INLINE void on_replacement_field(int id, const Char*) { auto arg = get_arg(context, id); context.advance_to(visit_format_arg( - default_arg_formatter{ - context.out(), context.args(), context.locale()}, + default_arg_formatter{context.out(), context.args(), + context.locale()}, arg)); } @@ -3105,8 +3104,8 @@ struct format_handler : detail::error_handler { if (begin == end || *begin != '}') on_error("missing '}' in format string"); } - context.advance_to( - visit_format_arg(arg_formatter(context, &parse_context, &specs), arg)); + context.advance_to(visit_format_arg( + arg_formatter(context, &parse_context, &specs), arg)); return begin; } }; @@ -3776,8 +3775,8 @@ void detail::vformat_to( arg); return; } - format_handler> h( - out, format_str, args, loc); + format_handler> h(out, format_str, args, + loc); parse_format_string(format_str, h); }