From 0771329bf31d5a3c91c8cd97efa66ea8df75a11c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= Date: Mon, 9 Aug 2021 16:16:17 +0200 Subject: [PATCH] Improvements based on review --- base/common/DateLUTImpl.cpp | 4 ++++ base/common/DateLUTImpl.h | 10 ++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/base/common/DateLUTImpl.cpp b/base/common/DateLUTImpl.cpp index e7faeb63760..472f24f3805 100644 --- a/base/common/DateLUTImpl.cpp +++ b/base/common/DateLUTImpl.cpp @@ -60,6 +60,7 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_) offset_at_start_of_epoch = cctz_time_zone.lookup(cctz_time_zone.lookup(epoch).pre).offset; offset_at_start_of_lut = cctz_time_zone.lookup(cctz_time_zone.lookup(lut_start).pre).offset; offset_is_whole_number_of_hours_during_epoch = true; + offset_is_whole_number_of_minutes_during_epoch = true; cctz::civil_day date = lut_start; @@ -108,6 +109,9 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_) if (offset_is_whole_number_of_hours_during_epoch && start_of_day > 0 && start_of_day % 3600) offset_is_whole_number_of_hours_during_epoch = false; + if (offset_is_whole_number_of_minutes_during_epoch && start_of_day > 0 && start_of_day % 60) + offset_is_whole_number_of_minutes_during_epoch = false; + /// If UTC offset was changed this day. /// Change in time zone without transition is possible, e.g. Moscow 1991 Sun, 31 Mar, 02:00 MSK to EEST cctz::time_zone::civil_transition transition{}; diff --git a/base/common/DateLUTImpl.h b/base/common/DateLUTImpl.h index 19407226bb5..85d8403df93 100644 --- a/base/common/DateLUTImpl.h +++ b/base/common/DateLUTImpl.h @@ -193,6 +193,7 @@ private: /// UTC offset at the beginning of the first supported year. Time offset_at_start_of_lut; bool offset_is_whole_number_of_hours_during_epoch; + bool offset_is_whole_number_of_minutes_during_epoch; /// Time zone name. std::string time_zone; @@ -464,7 +465,7 @@ public: inline unsigned toSecond(Time t) const { - if (offset_is_whole_number_of_hours_during_epoch) + if (likely(offset_is_whole_number_of_minutes_during_epoch)) { Time res = t % 60; if (likely(res >= 0)) @@ -478,15 +479,12 @@ public: if (time >= lut[index].time_at_offset_change()) time += lut[index].amount_of_offset_change(); - Time res = time % 60; - if (likely(res >= 0)) - return res; - return res + 60; + return time % 60; } inline unsigned toMinute(Time t) const { - if (t >= 0 && offset_is_whole_number_of_hours_during_epoch) + if (likely(t >= 0 && offset_is_whole_number_of_hours_during_epoch)) return (t / 60) % 60; /// To consider the DST changing situation within this day