feedc0de/date
1
0
Fork 0
forked from HowardHinnant/date
Code Pull Requests Activity

Fix minor problems for g++:

Browse Source 
* Add missing #include <string>

* Explicitly convert sys_days to sys_seconds in conditional operator
This commit is contained in:
Howard Hinnant
2017-06-12 09:44:41 -04:00
parent a610f087c1
commit cc81c9ea50
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tz.cpp
View File

@@ -92,6 +92,7 @@
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <cstdlib> #include <cstdlib>
#include <cstring>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
@@ -1807,7 +1808,8 @@ time_zone::load_sys_info(std::vector<detail::transition>::const_iterator i) cons
assert(i != transitions_.begin()); assert(i != transitions_.begin());
sys_info r; sys_info r;
r.begin = i[-1].timepoint; 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.offset = i[-1].info->offset;
r.save = i[-1].info->is_dst ? minutes{1} : minutes{0}; r.save = i[-1].info->is_dst ? minutes{1} : minutes{0};
r.abbrev = i[-1].info->abbrev; r.abbrev = i[-1].info->abbrev;