diff --git a/include/fmt/format.h b/include/fmt/format.h index 51aff51b..d36fe217 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -3948,10 +3948,9 @@ template <> struct formatter { public: template - FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { - auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, - detail::type::string_type); - return end; + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* { + return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, + detail::type::string_type); } template @@ -3988,10 +3987,9 @@ template struct formatter> : formatter { public: template - FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { - auto end = parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, - detail::type::int_type); - return end; + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const char* { + return parse_format_specs(ctx.begin(), ctx.end(), specs_, ctx, + detail::type::int_type); } template @@ -4007,6 +4005,7 @@ template struct formatter> : formatter { } }; +// DEPRECATED! join_view will be moved to ranges.h. template struct join_view : detail::view { It begin; @@ -4049,7 +4048,7 @@ struct formatter, Char> { public: template - FMT_CONSTEXPR auto parse(ParseContext& ctx) -> decltype(ctx.begin()) { + FMT_CONSTEXPR auto parse(ParseContext& ctx) -> const Char* { return value_formatter_.parse(ctx); }