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

Renaming copy_str_range to copy_str.

Browse Source
This commit is contained in:
Barry Revzin 2022-07-27 07:14:08 -05:00
parent 2e281620fc
commit de3bbcff53
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@ -1653,7 +1653,7 @@ auto copy_str(InputIt begin, InputIt end, appender out) -> appender {
} }
template <typename Char, typename R, typename OutputIt> template <typename Char, typename R, typename OutputIt>
FMT_CONSTEXPR auto copy_str_range(R&& rng, OutputIt out) -> OutputIt { FMT_CONSTEXPR auto copy_str(R&& rng, OutputIt out) -> OutputIt {
return detail::copy_str<Char>(rng.begin(), rng.end(), out); return detail::copy_str<Char>(rng.begin(), rng.end(), out);
} }

12
include/fmt/ranges.h
View File

@ -352,7 +352,7 @@ struct formatter<TupleT, Char,
// C++11 generic lambda for format(). // C++11 generic lambda for format().
template <typename FormatContext> struct format_each { template <typename FormatContext> struct format_each {
template <typename T> void operator()(const T& v) { template <typename T> void operator()(const T& v) {
if (i > 0) out = detail::copy_str_range<Char>(separator, out); if (i > 0) out = detail::copy_str<Char>(separator, out);
out = detail::write_range_entry<Char>(out, v); out = detail::write_range_entry<Char>(out, v);
++i; ++i;
} }
@ -383,9 +383,9 @@ struct formatter<TupleT, Char,
auto format(const TupleT& values, FormatContext& ctx) const auto format(const TupleT& values, FormatContext& ctx) const
-> decltype(ctx.out()) { -> decltype(ctx.out()) {
auto out = ctx.out(); auto out = ctx.out();
out = detail::copy_str_range<Char>(opening_bracket_, out); out = detail::copy_str<Char>(opening_bracket_, out);
detail::for_each(values, format_each<FormatContext>{0, out, separator_}); detail::for_each(values, format_each<FormatContext>{0, out, separator_});
out = detail::copy_str_range<Char>(closing_bracket_, out); out = detail::copy_str<Char>(closing_bracket_, out);
return out; return out;
} }
}; };
@ -509,18 +509,18 @@ struct range_formatter<
auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) { auto format(R&& range, FormatContext& ctx) const -> decltype(ctx.out()) {
detail::range_mapper<buffer_context<Char>> mapper; detail::range_mapper<buffer_context<Char>> mapper;
auto out = ctx.out(); auto out = ctx.out();
out = detail::copy_str_range<Char>(opening_bracket_, out); out = detail::copy_str<Char>(opening_bracket_, out);
int i = 0; int i = 0;
auto it = detail::range_begin(range); auto it = detail::range_begin(range);
auto end = detail::range_end(range); auto end = detail::range_end(range);
for (; it != end; ++it) { for (; it != end; ++it) {
if (i > 0) out = detail::copy_str_range<Char>(separator_, out); if (i > 0) out = detail::copy_str<Char>(separator_, out);
; ;
ctx.advance_to(out); ctx.advance_to(out);
out = underlying_.format(mapper.map(*it), ctx); out = underlying_.format(mapper.map(*it), ctx);
++i; ++i;
} }
out = detail::copy_str_range<Char>(closing_bracket_, out); out = detail::copy_str<Char>(closing_bracket_, out);
return out; return out;
} }
}; };