Skip to content

Fix ambiguous_local_time's message is slightly incorrect #3650

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
Stephan T. Lavavej (StephanTLavavej) merged 3 commits into from
Apr 14, 2023
Merged

Fix ambiguous_local_time's message is slightly incorrect #3650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2f6275
Fix `chrono`: `ambiguous_local_time's `message is slightly incorrect
YairBorn Apr 11, 2023
88af04e
Update `test.cpp`: `ambiguous_local_time's` message is slightly incor…
YairBorn Apr 11, 2023
5ddc865
Update `test.cpp`: `ambiguous_local_time's` message is slightly incor…
YairBorn Apr 11, 2023
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
2 changes: 1 addition & 1 deletion stl/inc/chrono
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6011,7 +6011,7 @@ namespace chrono {
template <class _Duration>
_NODISCARD string ambiguous_local_time::_Make_string(const local_time<_Duration>& _Tp, const local_info& _Info) {
ostringstream _Os;
_Os << _Tp << " is ambiguous. It could be\n"
_Os << _Tp << " is ambiguous. It could be\n"
<< _Tp << ' ' << _Info.first.abbrev << " == " << _Tp - _Info.first.offset << " UTC or\n"
<< _Tp << ' ' << _Info.second.abbrev << " == " << _Tp - _Info.second.offset << " UTC";
return _STD move(_Os).str();
Expand Down
4 changes: 2 additions & 2 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 @@ -798,11 +798,11 @@ void test_exception_classes() {
}

assert(s
== "2016-11-06 01:30:00 is ambiguous. It could be\n"
== "2016-11-06 01:30:00 is ambiguous. It could be\n"
"2016-11-06 01:30:00 EDT == 2016-11-06 05:30:00 UTC or\n"
"2016-11-06 01:30:00 EST == 2016-11-06 06:30:00 UTC"
|| s
== "2016-11-06 01:30:00 is ambiguous. It could be\n"
== "2016-11-06 01:30:00 is ambiguous. It could be\n"
"2016-11-06 01:30:00 GMT-4 == 2016-11-06 05:30:00 UTC or\n"
"2016-11-06 01:30:00 GMT-5 == 2016-11-06 06:30:00 UTC");
}
Expand Down