From 49376bfe87cb4bb8aa7667d1258a5248054d54a2 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 5 Jan 2015 21:20:06 +0800 Subject: [PATCH] Fix errors when using -Wshorten-64-to-32. --- utilities/backupable/backupable_db.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utilities/backupable/backupable_db.cc b/utilities/backupable/backupable_db.cc index 2e04488cb..2a526c940 100644 --- a/utilities/backupable/backupable_db.cc +++ b/utilities/backupable/backupable_db.cc @@ -1176,7 +1176,7 @@ Status BackupEngineImpl::BackupMeta::LoadFromFile( data.remove_prefix(next - data.data() + 1); // +1 for '\n' sequence_number_ = strtoull(data.data(), &next, 10); data.remove_prefix(next - data.data() + 1); // +1 for '\n' - num_files = strtoul(data.data(), &next, 10); + num_files = static_cast(strtoul(data.data(), &next, 10)); data.remove_prefix(next - data.data() + 1); // +1 for '\n' std::vector files; @@ -1205,7 +1205,8 @@ Status BackupEngineImpl::BackupMeta::LoadFromFile( uint32_t checksum_value = 0; if (line.starts_with(checksum_prefix)) { line.remove_prefix(checksum_prefix.size()); - checksum_value = strtoul(line.data(), nullptr, 10); + checksum_value = static_cast( + strtoul(line.data(), nullptr, 10)); if (memcmp(line.data(), std::to_string(checksum_value).c_str(), line.size() - 1) != 0) { return Status::Corruption("Invalid checksum value");