3party/date
0
0
Fork 0
mirror of https://github.com/HowardHinnant/date.git synced 2024-12-27 08:31:03 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ivanp2015-master'

Browse Source
This commit is contained in:
Howard Hinnant 2015-11-07 19:39:10 -05:00
commit 386d2b8c9d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tz.cpp
View File

@ -1165,8 +1165,8 @@ Rule::split_overlaps(std::vector<Rule>& rules)
return nm < x.name();
}) - rules.cbegin());
split_overlaps(rules, i, e);
auto first_rule = rules.cbegin() + static_cast<difference_type>(i);
auto last_rule = rules.cbegin() + static_cast<difference_type>(e);
auto first_rule = rules.begin() + static_cast<difference_type>(i);
auto last_rule = rules.begin() + static_cast<difference_type>(e);
auto t = std::lower_bound(first_rule, last_rule, min_year);
if (t > first_rule+1)
{
@ -1176,8 +1176,8 @@ Rule::split_overlaps(std::vector<Rule>& rules)
rules.erase(first_rule, t);
e -= d;
}
first_rule = rules.cbegin() + static_cast<difference_type>(i);
last_rule = rules.cbegin() + static_cast<difference_type>(e);
first_rule = rules.begin() + static_cast<difference_type>(i);
last_rule = rules.begin() + static_cast<difference_type>(e);
t = std::upper_bound(first_rule, last_rule, max_year);
if (t != last_rule)
{