summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-10-03 13:43:45 -0400
committerJoe George <joe@zeroc.com>2016-10-03 13:56:07 -0400
commit35e9e54fadeea03ba94e16ee2316069c0d9695d7 (patch)
tree3b552c1714ff17eb3457b4a3893cd02f4f3a0c24 /cpp/src
parentAdditional fix for ICE-7399 (diff)
downloadice-35e9e54fadeea03ba94e16ee2316069c0d9695d7.tar.bz2
ice-35e9e54fadeea03ba94e16ee2316069c0d9695d7.tar.xz
ice-35e9e54fadeea03ba94e16ee2316069c0d9695d7.zip
Another fix for ICE-7399
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IcePatch2Lib/ClientUtil.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp
index abea43b2ee7..d37f6af9b98 100644
--- a/cpp/src/IcePatch2Lib/ClientUtil.cpp
+++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp
@@ -856,8 +856,8 @@ PatcherI::updateFilesInternal(const LargeFileInfoSeq& files, const DecompressorP
// 'bytes' is always returned with size '_chunkSize'. When a file is smaller than '_chunkSize'
// or we are reading the last chunk of a file, 'bytes' will be larger than necessary. In this
// case we calculate the current position and updated size based on the known file size.
- Ice::Long size = static_cast<Ice::Long>(pos + bytes.size() > p->size ? p->size - pos :
- bytes.size());
+ size_t size = (pos + bytes.size()) > static_cast<size_t>(p->size) ?
+ static_cast<size_t>(p->size - pos) : bytes.size();
pos += size;
updated += size;