diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-06-12 20:15:48 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-06-12 20:15:48 +0000 |
| commit | 4f39b1d1aaa0bc067ba81bf12d1c29b320656116 (patch) | |
| tree | 2aaf7591357e35497d73fbe9187a46b5c7808255 /cpp/src/IcePatch2/Util.cpp | |
| parent | More alphabetical checks (diff) | |
| download | ice-4f39b1d1aaa0bc067ba81bf12d1c29b320656116.tar.bz2 ice-4f39b1d1aaa0bc067ba81bf12d1c29b320656116.tar.xz ice-4f39b1d1aaa0bc067ba81bf12d1c29b320656116.zip | |
fixes for 64 bit windows build.
Diffstat (limited to 'cpp/src/IcePatch2/Util.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index 6d50e29f14c..66642d5ba37 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -972,11 +972,11 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G } } - int bytesLeft = buf.st_size; + unsigned int bytesLeft = buf.st_size; while(bytesLeft > 0) { ByteSeq bytes(min(bytesLeft, 1024*1024)); - if(read(fd, &bytes[0], bytes.size()) == -1) + if(read(fd, &bytes[0], static_cast<unsigned int>(bytes.size())) == -1) { if(doCompress) { @@ -985,7 +985,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G close(fd); throw "cannot read from `" + path + "':\n" + lastError(); } - bytesLeft -= bytes.size(); + bytesLeft -= static_cast<unsigned int>(bytes.size()); if(doCompress) { |