diff options
| author | Joe George <joe@zeroc.com> | 2016-10-03 13:26:45 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-10-03 13:26:45 -0400 |
| commit | 4fdfd1b34b712d20b813bc7c75971ad700b69781 (patch) | |
| tree | 2afe4b6f043358ddc732a1d8d4ff16269613f75e /cpp/src/IcePatch2Lib/ClientUtil.cpp | |
| parent | Fixed ICE-7402 - support for user names with spaces (diff) | |
| download | ice-4fdfd1b34b712d20b813bc7c75971ad700b69781.tar.bz2 ice-4fdfd1b34b712d20b813bc7c75971ad700b69781.tar.xz ice-4fdfd1b34b712d20b813bc7c75971ad700b69781.zip | |
Additional fix for ICE-7399
Diffstat (limited to 'cpp/src/IcePatch2Lib/ClientUtil.cpp')
| -rw-r--r-- | cpp/src/IcePatch2Lib/ClientUtil.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2Lib/ClientUtil.cpp b/cpp/src/IcePatch2Lib/ClientUtil.cpp index dafbcbf582e..abea43b2ee7 100644 --- a/cpp/src/IcePatch2Lib/ClientUtil.cpp +++ b/cpp/src/IcePatch2Lib/ClientUtil.cpp @@ -856,7 +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 = pos + bytes.size() > p->size ? p->size - pos : bytes.size(); + Ice::Long size = static_cast<Ice::Long>(pos + bytes.size() > p->size ? p->size - pos : + bytes.size()); pos += size; updated += size; |