diff options
| author | Jose <jose@zeroc.com> | 2019-07-02 17:31:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-02 17:31:08 +0200 |
| commit | 5ff454c980022b2399511011f5d503a77b231e8f (patch) | |
| tree | 40e22c4c1fb834c7f940b8c35ba9f13a47ceaa89 /cpp/src/Ice/ios/StreamTransceiver.cpp | |
| parent | update Cartfile.resolved (diff) | |
| parent | Check sysconf errors Close #418 (#420) (diff) | |
| download | ice-5ff454c980022b2399511011f5d503a77b231e8f.tar.bz2 ice-5ff454c980022b2399511011f5d503a77b231e8f.tar.xz ice-5ff454c980022b2399511011f5d503a77b231e8f.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/Ice/ios/StreamTransceiver.cpp')
| -rw-r--r-- | cpp/src/Ice/ios/StreamTransceiver.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp index 1405e476d39..b033ed1dfa5 100644 --- a/cpp/src/Ice/ios/StreamTransceiver.cpp +++ b/cpp/src/Ice/ios/StreamTransceiver.cpp @@ -320,7 +320,7 @@ IceObjC::StreamTransceiver::write(Buffer& buf) checkErrorStatus(_writeStream.get(), 0, __FILE__, __LINE__); } - size_t packetSize = buf.b.end() - buf.i; + size_t packetSize = static_cast<size_t>(buf.b.end() - buf.i); while(buf.i != buf.b.end()) { if(!CFWriteStreamCanAcceptBytes(_writeStream.get())) @@ -329,7 +329,8 @@ IceObjC::StreamTransceiver::write(Buffer& buf) } assert(_fd != INVALID_SOCKET); - CFIndex ret = CFWriteStreamWrite(_writeStream.get(), reinterpret_cast<const UInt8*>(&*buf.i), packetSize); + CFIndex ret = CFWriteStreamWrite(_writeStream.get(), reinterpret_cast<const UInt8*>(&*buf.i), + static_cast<CFIndex>(packetSize)); if(ret == SOCKET_ERROR) { @@ -345,7 +346,7 @@ IceObjC::StreamTransceiver::write(Buffer& buf) if(packetSize > static_cast<size_t>(buf.b.end() - buf.i)) { - packetSize = buf.b.end() - buf.i; + packetSize = static_cast<size_t>(buf.b.end() - buf.i); } } return SocketOperationNone; @@ -360,7 +361,7 @@ IceObjC::StreamTransceiver::read(Buffer& buf) checkErrorStatus(0, _readStream.get(), __FILE__, __LINE__); } - size_t packetSize = buf.b.end() - buf.i; + size_t packetSize = static_cast<size_t>(buf.b.end() - buf.i); while(buf.i != buf.b.end()) { if(!CFReadStreamHasBytesAvailable(_readStream.get())) @@ -369,7 +370,8 @@ IceObjC::StreamTransceiver::read(Buffer& buf) } assert(_fd != INVALID_SOCKET); - CFIndex ret = CFReadStreamRead(_readStream.get(), reinterpret_cast<UInt8*>(&*buf.i), packetSize); + CFIndex ret = CFReadStreamRead(_readStream.get(), reinterpret_cast<UInt8*>(&*buf.i), + static_cast<CFIndex>(packetSize)); if(ret == 0) { @@ -390,7 +392,7 @@ IceObjC::StreamTransceiver::read(Buffer& buf) if(packetSize > static_cast<size_t>(buf.b.end() - buf.i)) { - packetSize = buf.b.end() - buf.i; + packetSize = static_cast<size_t>(buf.b.end() - buf.i); } } |