diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-04-29 19:51:33 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-04-29 19:51:33 +0000 |
| commit | d6b805efcf63a16a759f0a104db74c5e9c009f7d (patch) | |
| tree | 2a73b6a3e15c2cf711a0c4f1ab12dd52687e003e /cpp/src/IcePatch/ClientUtil.cpp | |
| parent | file UserExceptionFactory.h was initially added on branch slicing. (diff) | |
| download | ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.bz2 ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.tar.xz ice-d6b805efcf63a16a759f0a104db74c5e9c009f7d.zip | |
Sun: 64 bit + CC 5.3 support
Diffstat (limited to 'cpp/src/IcePatch/ClientUtil.cpp')
| -rw-r--r-- | cpp/src/IcePatch/ClientUtil.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IcePatch/ClientUtil.cpp b/cpp/src/IcePatch/ClientUtil.cpp index 8c7805ac6d7..b9f54b78b0b 100644 --- a/cpp/src/IcePatch/ClientUtil.cpp +++ b/cpp/src/IcePatch/ClientUtil.cpp @@ -49,12 +49,12 @@ IcePatch::getRegular(const RegularPrx& regular, ProgressCB& progressCB) FileInfo infoBZ2 = getFileInfo(pathBZ2, false); if(infoBZ2.type == FileTypeRegular) { - ByteSeq remoteBZ2MD5 = regular->getBZ2MD5(infoBZ2.size); - ByteSeq localBZ2MD5 = calcPartialMD5(pathBZ2, infoBZ2.size); + ByteSeq remoteBZ2MD5 = regular->getBZ2MD5(static_cast<Int>(infoBZ2.size)); + ByteSeq localBZ2MD5 = calcPartialMD5(pathBZ2, static_cast<Int>(infoBZ2.size)); if(remoteBZ2MD5 == localBZ2MD5) { - posBZ2 = infoBZ2.size; + posBZ2 = static_cast<Int>(infoBZ2.size); } } @@ -81,7 +81,7 @@ IcePatch::getRegular(const RegularPrx& regular, ProgressCB& progressCB) break; } - posBZ2 += bytesBZ2.size(); + posBZ2 += static_cast<Int>(bytesBZ2.size()); fileBZ2.write(&bytesBZ2[0], bytesBZ2.size()); if(!fileBZ2) @@ -167,7 +167,7 @@ IcePatch::getRegular(const RegularPrx& regular, ProgressCB& progressCB) throw ex; } - progressCB.updateUncompress(totalBZ2, pos); + progressCB.updateUncompress(totalBZ2, static_cast<Int>(pos)); file.write(bytesBZ2, sz); if(!file) |