diff options
author | Jose <jose@zeroc.com> | 2019-06-21 22:22:14 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2019-06-21 22:22:14 +0200 |
commit | d1b7c66fab777fe72e5cf77fd284218e2080b017 (patch) | |
tree | b48615b2d9d2f59195c8a560e07585b9cbb77cb5 /cpp/src/Ice/StreamSocket.cpp | |
parent | Add ice_isFixed - Close #356 (diff) | |
download | ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.tar.bz2 ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.tar.xz ice-d1b7c66fab777fe72e5cf77fd284218e2080b017.zip |
Enable -Wconversion with clang - Close #363
Diffstat (limited to 'cpp/src/Ice/StreamSocket.cpp')
-rwxr-xr-x | cpp/src/Ice/StreamSocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/StreamSocket.cpp b/cpp/src/Ice/StreamSocket.cpp index f335736f8ca..e3b41088347 100755 --- a/cpp/src/Ice/StreamSocket.cpp +++ b/cpp/src/Ice/StreamSocket.cpp @@ -178,7 +178,7 @@ StreamSocket::read(Buffer& buf) { while(true) { - ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i); + ssize_t ret = read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i)); if(ret == 0) { return SocketOperationRead; @@ -191,7 +191,7 @@ StreamSocket::read(Buffer& buf) } } } - buf.i += read(reinterpret_cast<char*>(&*buf.i), buf.b.end() - buf.i); + buf.i += read(reinterpret_cast<char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i)); #endif return buf.i != buf.b.end() ? SocketOperationRead : SocketOperationNone; } @@ -204,7 +204,7 @@ StreamSocket::write(Buffer& buf) { while(true) { - ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i); + ssize_t ret = write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i)); if(ret == 0) { return SocketOperationWrite; @@ -217,7 +217,7 @@ StreamSocket::write(Buffer& buf) } } } - buf.i += write(reinterpret_cast<const char*>(&*buf.i), buf.b.end() - buf.i); + buf.i += write(reinterpret_cast<const char*>(&*buf.i), static_cast<size_t>(buf.b.end() - buf.i)); #endif return buf.i != buf.b.end() ? SocketOperationWrite : SocketOperationNone; } @@ -272,7 +272,7 @@ StreamSocket::read(char* buf, size_t length) buf += ret; read += ret; - length -= ret; + length -= static_cast<size_t>(ret); if(packetSize > length) { @@ -339,7 +339,7 @@ StreamSocket::write(const char* buf, size_t length) buf += ret; sent += ret; - length -= ret; + length -= static_cast<size_t>(ret); if(packetSize > length) { |