Merge branch 'ncopa-fix-time64' into master

pull/1682/head
Tatsuhiro Tsujikawa 2020-12-28 10:12:18 +09:00
commit f292bbba85
1 changed files with 4 additions and 3 deletions

View File

@ -183,11 +183,12 @@ bool ServerStat::operator==(const ServerStat& serverStat) const
std::string ServerStat::toString() const std::string ServerStat::toString() const
{ {
return fmt("host=%s, protocol=%s, dl_speed=%d, sc_avg_speed=%d," return fmt("host=%s, protocol=%s, dl_speed=%d, sc_avg_speed=%d,"
" mc_avg_speed=%d, last_updated=%ld, counter=%d, status=%s", " mc_avg_speed=%d, last_updated=%" PRId64
", counter=%d, status=%s",
getHostname().c_str(), getProtocol().c_str(), getDownloadSpeed(), getHostname().c_str(), getProtocol().c_str(), getDownloadSpeed(),
getSingleConnectionAvgSpeed(), getMultiConnectionAvgSpeed(), getSingleConnectionAvgSpeed(), getMultiConnectionAvgSpeed(),
getLastUpdated().getTimeFromEpoch(), getCounter(), static_cast<int64_t>(getLastUpdated().getTimeFromEpoch()),
STATUS_STRING[getStatus()]); getCounter(), STATUS_STRING[getStatus()]);
} }
} // namespace aria2 } // namespace aria2