From d2f62754182407138f4ee236d58c294fec984448 Mon Sep 17 00:00:00 2001 From: YairBorn <77966440+YairBorn@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:09:07 +0300 Subject: [PATCH 1/3] Fix `chrono`: `ambiguous_local_time's `message is slightly incorrect --- stl/inc/chrono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stl/inc/chrono b/stl/inc/chrono index 202b9aa847b..6befb8777bd 100644 --- a/stl/inc/chrono +++ b/stl/inc/chrono @@ -6011,7 +6011,7 @@ namespace chrono { template _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(); From 88af04eea56453f2708164c43fe3777361a20f61 Mon Sep 17 00:00:00 2001 From: YairBorn <77966440+YairBorn@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:12:43 +0300 Subject: [PATCH 2/3] Update `test.cpp`: `ambiguous_local_time's` message is slightly incorrect --- .../tests/P0355R7_calendars_and_time_zones_formatting/test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp b/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp index 1b4e719d1b0..f6453cf8a21 100644 --- a/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp +++ b/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp @@ -798,7 +798,7 @@ 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 From 5ddc8655f223136b4bdb3ae4c7d08414da4a6830 Mon Sep 17 00:00:00 2001 From: YairBorn <77966440+YairBorn@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:13:20 +0300 Subject: [PATCH 3/3] Update `test.cpp`: `ambiguous_local_time's` message is slightly incorrect --- .../tests/P0355R7_calendars_and_time_zones_formatting/test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp b/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp index f6453cf8a21..f9de6a57ea5 100644 --- a/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp +++ b/tests/std/tests/P0355R7_calendars_and_time_zones_formatting/test.cpp @@ -802,7 +802,7 @@ void test_exception_classes() { "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"); }