Fix compilation warnings for -DUSE_OS_TZDB.

tz.cpp:1617:24: error: unused parameter 't' [-Werror,-Wunused-parameter]
maybe_reverse_bytes(T& t, std::false_type)
                       ^
tz.cpp:2470:1: error: unused function 'get_version' [-Werror,-Wunused-function]
get_version()
^
tz.cpp: In lambda function:
tz.cpp:1922:84: error: declaration of ‘t’ shadows a previous local [-Werror=shadow]
                                        [](const sys_seconds& x, const transition& t)
                                                                                    ^
tz.cpp:1921:19: note: shadowed declaration is here
         for (auto t = std::upper_bound(transitions_.begin(), transitions_.end(), l,
                   ^
This commit is contained in:
Jan Kratochvil
2017-08-12 22:46:01 +02:00
committed by Howard Hinnant
parent 82de27d339
commit e7c3ca0e90

8
tz.cpp
View File

@@ -1614,7 +1614,7 @@ template <class T>
static static
inline inline
void void
maybe_reverse_bytes(T& t, std::false_type) maybe_reverse_bytes(T&, std::false_type)
{ {
} }
@@ -1919,9 +1919,9 @@ time_zone::init_impl()
auto l = itr->date(); auto l = itr->date();
seconds leap_count{0}; seconds leap_count{0};
for (auto t = std::upper_bound(transitions_.begin(), transitions_.end(), l, for (auto t = std::upper_bound(transitions_.begin(), transitions_.end(), l,
[](const sys_seconds& x, const transition& t) [](const sys_seconds& x, const transition& ct)
{ {
return x < t.timepoint; return x < ct.timepoint;
}); });
t != transitions_.end(); ++t) t != transitions_.end(); ++t)
{ {
@@ -2465,6 +2465,7 @@ operator<<(std::ostream& os, const leap& x)
#if USE_OS_TZDB #if USE_OS_TZDB
# ifdef __APPLE__
static static
std::string std::string
get_version() get_version()
@@ -2478,6 +2479,7 @@ get_version()
throw std::runtime_error("Unable to get Timezone database version from " + path); throw std::runtime_error("Unable to get Timezone database version from " + path);
return version; return version;
} }
# endif
static static
TZ_DB TZ_DB