From cc81c9ea503f843501a7c71fb871fcf104f732b0 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Mon, 12 Jun 2017 09:44:41 -0400 Subject: [PATCH] Fix minor problems for g++: * Add missing #include * Explicitly convert sys_days to sys_seconds in conditional operator --- tz.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tz.cpp b/tz.cpp index ab8ba9a..cdfa67f 100644 --- a/tz.cpp +++ b/tz.cpp @@ -92,6 +92,7 @@ #include #include #include +#include #include #include #include @@ -1807,7 +1808,8 @@ time_zone::load_sys_info(std::vector::const_iterator i) cons assert(i != transitions_.begin()); sys_info r; r.begin = i[-1].timepoint; - r.end = i != transitions_.end() ? i->timepoint : sys_days(year::max()/max_day); + r.end = i != transitions_.end() ? i->timepoint : + sys_seconds(sys_days(year::max()/max_day)); r.offset = i[-1].info->offset; r.save = i[-1].info->is_dst ? minutes{1} : minutes{0}; r.abbrev = i[-1].info->abbrev;