Skip to content

<chrono>: Fix hh_mm_ss subsecond formatting for floats #1866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eldakesh-ms merged 2 commits into from
Apr 20, 2021
Merged

<chrono>: Fix hh_mm_ss subsecond formatting for floats #1866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70db391
<chrono>: Fix hh_mm_ss subsecond formatting for floats
eldakesh-ms Apr 20, 2021
5db6ebf
Floor subseconds
eldakesh-ms Apr 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions stl/inc/chrono
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5469,9 +5469,14 @@ namespace chrono {
void _Write_seconds(basic_ostream<_CharT, _Traits>& _Os, const hh_mm_ss<_Duration>& _Val) {
_Os << _STD format(_STATICALLY_WIDEN(_CharT, "{:02}"), _Val.seconds().count());
if constexpr (hh_mm_ss<_Duration>::fractional_width > 0) {
_Os << _STD format(_STATICALLY_WIDEN(_CharT, "{0}{1:0{2}}"),
_STD use_facet<numpunct<_CharT>>(_Os.getloc()).decimal_point(), _Val.subseconds().count(),
_Val.fractional_width);
_Os << _STD use_facet<numpunct<_CharT>>(_Os.getloc()).decimal_point();
if constexpr (treat_as_floating_point_v<typename hh_mm_ss<_Duration>::precision::rep>) {
_Os << _STD format(_STATICALLY_WIDEN(_CharT, "{:0{}.0f}"), _STD floor(_Val.subseconds().count()),
_Val.fractional_width);
} else {
_Os << _STD format(
_STATICALLY_WIDEN(_CharT, "{:0{}}"), _Val.subseconds().count(), _Val.fractional_width);
}
}
}

Expand Down
8 changes: 8 additions & 0 deletions tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,14 @@ void test_hh_mm_ss_formatter() {
empty_braces_helper(hh_mm_ss{4083007ms}, STR("01:08:03.007"));
empty_braces_helper(hh_mm_ss{65745123ms}, STR("18:15:45.123"));
empty_braces_helper(hh_mm_ss{65745s}, STR("18:15:45"));
empty_braces_helper(hh_mm_ss{0.1ns}, STR("00:00:00.000000000"));
empty_braces_helper(hh_mm_ss{1.45ns}, STR("00:00:00.000000001"));
empty_braces_helper(hh_mm_ss{1.56ns}, STR("00:00:00.000000001"));
empty_braces_helper(hh_mm_ss{1e+8ns}, STR("00:00:00.100000000"));
empty_braces_helper(hh_mm_ss{999'999.9us}, STR("00:00:00.999999"));
empty_braces_helper(hh_mm_ss{59'999'999.9us}, STR("00:00:59.999999"));
empty_braces_helper(hh_mm_ss{3'599'999'999.9us}, STR("00:59:59.999999"));
empty_braces_helper(hh_mm_ss{86'399'999'999.9us}, STR("23:59:59.999999"));

assert(format(STR("{:%H %I %M %S %r %R %T %p}"), hh_mm_ss{13h + 14min + 15351ms})
== STR("13 01 14 15.351 13:14:15 13:14 13:14:15.351 PM"));
Expand Down