From 1fd080675761566f8c18cb9af14c6fc66db23b52 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sun, 2 Apr 2017 22:19:00 +0200 Subject: [PATCH] Fix -Wshadow for gcc and clang. --- tz.cpp | 4 ++-- tz.h | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tz.cpp b/tz.cpp index 328736d..e84f0fd 100644 --- a/tz.cpp +++ b/tz.cpp @@ -2280,9 +2280,9 @@ download_to_string(const std::string& url, std::string& str) curl_write_callback write_cb = [](char* contents, std::size_t size, std::size_t nmemb, void* userp) -> std::size_t { - auto& str = *static_cast(userp); + auto& userstr = *static_cast(userp); auto realsize = size * nmemb; - str.append(contents, realsize); + userstr.append(contents, realsize); return realsize; }; curl_easy_setopt(curl.get(), CURLOPT_WRITEFUNCTION, write_cb); diff --git a/tz.h b/tz.h index 5c285b8..8c9966d 100644 --- a/tz.h +++ b/tz.h @@ -141,25 +141,25 @@ private: template inline nonexistent_local_time::nonexistent_local_time(local_time tp, - local_seconds first, + local_seconds begin, const std::string& first_abbrev, - local_seconds last, + local_seconds end, const std::string& last_abbrev, sys_seconds time_sys) - : std::runtime_error(make_msg(tp, first, first_abbrev, last, last_abbrev, time_sys)) + : std::runtime_error(make_msg(tp, begin, first_abbrev, end, last_abbrev, time_sys)) {} template std::string -nonexistent_local_time::make_msg(local_time tp, local_seconds first, - const std::string& first_abbrev, local_seconds last, +nonexistent_local_time::make_msg(local_time tp, local_seconds begin, + const std::string& first_abbrev, local_seconds end, const std::string& last_abbrev, sys_seconds time_sys) { using namespace date; std::ostringstream os; os << tp << " is in a gap between\n" - << first << ' ' << first_abbrev << " and\n" - << last << ' ' << last_abbrev + << begin << ' ' << first_abbrev << " and\n" + << end << ' ' << last_abbrev << " which are both equivalent to\n" << time_sys << " UTC"; return os.str();