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

fix -Wshadow warnings

Browse Source
This commit is contained in:
tylawin
2021-09-12 00:53:46 -06:00
parent 2e19c006e2
commit 2709deddd3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/tz.cpp
View File

@@ -2669,16 +2669,16 @@ find_read_and_leap_seconds()
std::getline(in, line); std::getline(in, line);
if (!line.empty() && line[0] != '#') if (!line.empty() && line[0] != '#')
{ {
std::istringstream in(line); std::istringstream iss(line);
in.exceptions(std::ios::failbit | std::ios::badbit); iss.exceptions(std::ios::failbit | std::ios::badbit);
std::string word; std::string word;
in >> word; iss >> word;
if (word == "Leap") if (word == "Leap")
{ {
int y, m, d; int y, m, d;
in >> y; iss >> y;
m = static_cast<int>(parse_month(in)); m = static_cast<int>(parse_month(iss));
in >> d; iss >> d;
leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1}, leap_seconds.push_back(leap_second(sys_days{year{y}/m/d} + days{1},
detail::undocumented{})); detail::undocumented{}));
} }
@@ -2703,11 +2703,11 @@ find_read_and_leap_seconds()
std::getline(in, line); std::getline(in, line);
if (!line.empty() && line[0] != '#') if (!line.empty() && line[0] != '#')
{ {
std::istringstream in(line); std::istringstream iss(line);
in.exceptions(std::ios::failbit | std::ios::badbit); iss.exceptions(std::ios::failbit | std::ios::badbit);
using seconds = std::chrono::seconds; using seconds = std::chrono::seconds;
seconds::rep s; seconds::rep s;
in >> s; iss >> s;
if (s == 2272060800) if (s == 2272060800)
continue; continue;
leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset, leap_seconds.push_back(leap_second(sys_seconds{seconds{s}} - offset,