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

* Hopefully fix int64_t to int32_t conversion errors.

Browse Source 
* Allow proper Duration::rep type to propagate via template argument deduction
This commit is contained in:
matrackif 2021-11-29 01:52:38 +01:00
parent 863d2ffc57
commit beacfd3289
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/fmt/chrono.h
View File

@ -1589,7 +1589,8 @@ struct chrono_formatter {
} }
} }
void write(Rep value, int width) { template <typename RepType>
void write(RepType value, int width) {
write_sign(); write_sign();
if (isnan(value)) return write_nan(); if (isnan(value)) return write_nan();
uint32_or_64_or_128_t<std::intmax_t> n = uint32_or_64_or_128_t<std::intmax_t> n =
@ -1676,20 +1677,13 @@ struct chrono_formatter {
if (ns == numeric_system::standard) { if (ns == numeric_system::standard) {
write(second(), 2); write(second(), 2);
#if FMT_SAFE_DURATION_CAST
// convert rep->Rep
using duration_rep = std::chrono::duration<rep, Period>; using duration_rep = std::chrono::duration<rep, Period>;
using duration_Rep = std::chrono::duration<Rep, Period>; using subsec_helper = detail::subsecond_helper<duration_rep>;
auto tmpval = fmt_safe_duration_cast<duration_Rep>(duration_rep{val});
#else
auto tmpval = std::chrono::duration<Rep, Period>(val);
#endif
using subsec_helper = detail::subsecond_helper<duration_Rep>;
// Could use c++ 17 if constexpr // Could use c++ 17 if constexpr
if (std::ratio_less<typename subsec_helper::precision::period, if (std::ratio_less<typename subsec_helper::precision::period,
std::chrono::seconds::period>::value) { std::chrono::seconds::period>::value) {
*out++ = '.'; *out++ = '.';
write(subsec_helper::get_subseconds(tmpval), subsec_helper::fractional_width); write(subsec_helper::get_subseconds(duration_rep{val}), subsec_helper::fractional_width);
} }
return; return;
} }