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

Merge branch 'ivanp2015-master'

Browse Source
This commit is contained in:
Howard Hinnant
2015-11-07 19:39:10 -05:00
parent db9f0d19ba bf699e573b
commit 386d2b8c9d
1 changed files with 4 additions and 4 deletions
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(); return nm < x.name();
}) - rules.cbegin()); }) - rules.cbegin());
split_overlaps(rules, i, e); split_overlaps(rules, i, e);
auto first_rule = rules.cbegin() + static_cast<difference_type>(i); auto first_rule = rules.begin() + static_cast<difference_type>(i);
auto last_rule = rules.cbegin() + static_cast<difference_type>(e); auto last_rule = rules.begin() + static_cast<difference_type>(e);
auto t = std::lower_bound(first_rule, last_rule, min_year); auto t = std::lower_bound(first_rule, last_rule, min_year);
if (t > first_rule+1) if (t > first_rule+1)
{ {
@@ -1176,8 +1176,8 @@ Rule::split_overlaps(std::vector<Rule>& rules)
rules.erase(first_rule, t); rules.erase(first_rule, t);
e -= d; e -= d;
} }
first_rule = rules.cbegin() + static_cast<difference_type>(i); first_rule = rules.begin() + static_cast<difference_type>(i);
last_rule = rules.cbegin() + static_cast<difference_type>(e); last_rule = rules.begin() + static_cast<difference_type>(e);
t = std::upper_bound(first_rule, last_rule, max_year); t = std::upper_bound(first_rule, last_rule, max_year);
if (t != last_rule) if (t != last_rule)
{ {