From b49b8d16b67ec6912899684b732e6367f258cfdb Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 6 Aug 2019 15:11:42 -0700 Subject: Export of internal Abseil changes -- 00c451dc81be7fe05f982b08b4ea1edc2ca2c1c5 by Abseil Team : remove a test that is currently broken on emscripten from running on emscripten. PiperOrigin-RevId: 262005667 -- 9df5f5acb65996bdb99900039a4f01a44811aa14 by CJ Johnson : Adds a layer of macro-indirection to opening up namespace absl inside a macro. This helps avoid an issue identified with the LTS inline namespaces PiperOrigin-RevId: 261990937 -- 5d40aa129cd77a1b853e5389aff7eacffe5c8204 by Gennadiy Rozental : Fix handling of new lines in flag help descriptions. If there are explicit new lines in a flag help description string, we respect it and format the usage message accordingly. PiperOrigin-RevId: 261974244 -- 4997b5a2ddb983969059470a2d2bc2416b3d785e by CJ Johnson : Import of CCTZ from GitHub. PiperOrigin-RevId: 261955031 GitOrigin-RevId: 00c451dc81be7fe05f982b08b4ea1edc2ca2c1c5 Change-Id: I5a13bfb15bba0f7b6e49c0655c57c3addfeb1c72 --- absl/time/internal/cctz/src/time_zone_posix.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'absl/time') diff --git a/absl/time/internal/cctz/src/time_zone_posix.cc b/absl/time/internal/cctz/src/time_zone_posix.cc index 993901a..038740e 100644 --- a/absl/time/internal/cctz/src/time_zone_posix.cc +++ b/absl/time/internal/cctz/src/time_zone_posix.cc @@ -100,9 +100,9 @@ const char* ParseDateTime(const char* p, PosixTransition* res) { int weekday = 0; if ((p = ParseInt(p + 1, 0, 6, &weekday)) != nullptr) { res->date.fmt = PosixTransition::M; - res->date.m.month = static_cast(month); - res->date.m.week = static_cast(week); - res->date.m.weekday = static_cast(weekday); + res->date.m.month = static_cast(month); + res->date.m.week = static_cast(week); + res->date.m.weekday = static_cast(weekday); } } } @@ -110,13 +110,13 @@ const char* ParseDateTime(const char* p, PosixTransition* res) { int day = 0; if ((p = ParseInt(p + 1, 1, 365, &day)) != nullptr) { res->date.fmt = PosixTransition::J; - res->date.j.day = static_cast(day); + res->date.j.day = static_cast(day); } } else { int day = 0; if ((p = ParseInt(p, 0, 365, &day)) != nullptr) { res->date.fmt = PosixTransition::N; - res->date.j.day = static_cast(day); + res->date.n.day = static_cast(day); } } } -- cgit v1.2.3