diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /cpp/src/IcePatch2/FileServerI.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/FileServerI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index f04e9319fa0..c1f57236027 100644 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -43,7 +43,7 @@ IcePatch2::FileServerI::getLargeFileInfoSeq(Int node0, const Current&) const throw PartitionOutOfRangeException(); } - return _tree0.nodes[node0].files; + return _tree0.nodes[static_cast<size_t>(node0)].files; } ByteSeqSeq @@ -51,7 +51,7 @@ IcePatch2::FileServerI::getChecksumSeq(const Current&) const { ByteSeqSeq checksums(256); - for(int node0 = 0; node0 < 256; ++node0) + for(size_t node0 = 0; node0 < 256; ++node0) { checksums[node0] = _tree0.nodes[node0].checksum; } @@ -176,7 +176,7 @@ IcePatch2::FileServerI::getFileCompressedInternal(const std::string& pa, Ice::Lo IceUtilInternal::errorToString(errno)); } - buffer.resize(num); + buffer.resize(static_cast<size_t>(num)); #ifdef _WIN32 int r; if((r = _read(fd, &buffer[0], static_cast<unsigned int>(num))) == -1) |