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

remove vformat from chrono.h

Browse Source
This commit is contained in:
Walter Gray 2020-12-20 16:26:53 -08:00
parent c85d5e342c
commit b9063f9392
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/fmt/chrono.h
View File

@ -768,24 +768,16 @@ inline std::chrono::duration<Rep, std::milli> get_milliseconds(
template <typename Char, typename Rep, typename OutputIt, template <typename Char, typename Rep, typename OutputIt,
FMT_ENABLE_IF(std::is_integral<Rep>::value)> FMT_ENABLE_IF(std::is_integral<Rep>::value)>
OutputIt format_duration_value(OutputIt out, Rep val, int) { OutputIt format_duration_value(OutputIt out, Rep val, int) {
static FMT_CONSTEXPR_DECL const Char format[] = {'{', '}', 0}; return write<Char>(out, val);
return vformat_to(out, to_string_view(format),
make_format_args<buffer_context<Char>>(val));
} }
template <typename Char, typename Rep, typename OutputIt, template <typename Char, typename Rep, typename OutputIt,
FMT_ENABLE_IF(std::is_floating_point<Rep>::value)> FMT_ENABLE_IF(std::is_floating_point<Rep>::value)>
OutputIt format_duration_value(OutputIt out, Rep val, int precision) { OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
static FMT_CONSTEXPR_DECL const Char pr_f[] = {'{', ':', '.', '{', basic_format_specs<Char> specs;
'}', 'f', '}', 0}; specs.precision = precision;
if (precision >= 0) { specs.type = precision > 0 ? 'f' : 'g';
return vformat_to(out, to_string_view(pr_f), return write<Char>(out, val, specs);
make_format_args<buffer_context<Char>>(val, precision));
}
static FMT_CONSTEXPR_DECL const Char fp_f[] = {'{', ':', 'g', '}', 0};
return vformat_to(out, to_string_view(fp_f),
make_format_args<buffer_context<Char>>(val));
} }
template <typename Char, typename OutputIt> template <typename Char, typename OutputIt>
@ -805,16 +797,20 @@ template <typename Char, typename Period, typename OutputIt>
OutputIt format_duration_unit(OutputIt out) { OutputIt format_duration_unit(OutputIt out) {
if (const char* unit = get_units<Period>()) if (const char* unit = get_units<Period>())
return copy_unit(string_view(unit), out, Char()); return copy_unit(string_view(unit), out, Char());
static FMT_CONSTEXPR_DECL const Char num_f[] = {'[', '{', '}', ']', 's', 0};
if (const_check(Period::den == 1)) { basic_memory_buffer<Char> buffer;
return vformat_to(out, to_string_view(num_f), auto bufOut = std::back_inserter(buffer);
make_format_args<buffer_context<Char>>(Period::num)); *bufOut++ = '[';
bufOut = write<Char>(bufOut, Period::num);
if (const_check(Period::den != 1)) {
*bufOut++ = '/';
bufOut = write<Char>(bufOut, Period::den);
} }
static FMT_CONSTEXPR_DECL const Char num_def_f[] = {'[', '{', '}', '/', '{',
'}', ']', 's', 0}; *bufOut++ = ']';
return vformat_to( *bufOut++ = 's';
out, to_string_view(num_def_f), return write<Char>(out, {buffer.data(), buffer.size()});
make_format_args<buffer_context<Char>>(Period::num, Period::den));
} }
template <typename FormatContext, typename OutputIt, typename Rep, template <typename FormatContext, typename OutputIt, typename Rep,