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

tz.cpp: Cast conversions to/from size_t

Browse Source 
These cause warnings with -Wsign-conversion.
This commit is contained in:
Matt Kline
2019-05-02 16:37:34 -07:00
committed by Howard Hinnant
parent 27d1e1e54e
commit 7ef1a55143
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/tz.cpp
View File

@@ -1930,7 +1930,7 @@ load_leaps(std::istream& inf, std::int32_t tzh_leapcnt)
// Read tzh_leapcnt pairs // Read tzh_leapcnt pairs
using namespace std::chrono; using namespace std::chrono;
std::vector<leap> leap_seconds; std::vector<leap> leap_seconds;
leap_seconds.reserve(tzh_leapcnt); leap_seconds.reserve(static_cast<std::size_t>(tzh_leapcnt));
for (std::int32_t i = 0; i < tzh_leapcnt; ++i) for (std::int32_t i = 0; i < tzh_leapcnt; ++i)
{ {
TimeType t0; TimeType t0;
@@ -1952,7 +1952,8 @@ load_leap_data(std::istream& inf,
std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt, std::int32_t tzh_leapcnt, std::int32_t tzh_timecnt,
std::int32_t tzh_typecnt, std::int32_t tzh_charcnt) std::int32_t tzh_typecnt, std::int32_t tzh_charcnt)
{ {
inf.ignore(tzh_timecnt*sizeof(TimeType) + tzh_timecnt + tzh_typecnt*6 + tzh_charcnt); inf.ignore(tzh_timecnt*static_cast<std::int32_t>(sizeof(TimeType)) + tzh_timecnt +
tzh_typecnt*6 + tzh_charcnt);
return load_leaps<TimeType>(inf, tzh_leapcnt); return load_leaps<TimeType>(inf, tzh_leapcnt);
} }