From 60ea1d3f6583699a0a1abf78ac0ea52ce3068fa6 Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Thu, 27 Jun 2019 00:38:57 +0200
Subject: iOS build fixes

---
 cpp/src/Ice/ios/StreamTransceiver.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'cpp/src/Ice/ios/StreamTransceiver.cpp')

diff --git a/cpp/src/Ice/ios/StreamTransceiver.cpp b/cpp/src/Ice/ios/StreamTransceiver.cpp
index 6a0815625b5..414f2e31957 100644
--- a/cpp/src/Ice/ios/StreamTransceiver.cpp
+++ b/cpp/src/Ice/ios/StreamTransceiver.cpp
@@ -316,7 +316,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()))
@@ -325,7 +325,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)
         {
@@ -341,7 +342,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;
@@ -356,7 +357,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()))
@@ -365,7 +366,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)
         {
@@ -386,7 +388,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);
         }
     }
 
@@ -507,7 +509,7 @@ IceObjC::StreamTransceiver::checkErrorStatus(CFWriteStreamRef writeStream, CFRea
     CFStringRef domain = CFErrorGetDomain(err.get());
     if(CFStringCompare(domain, kCFErrorDomainPOSIX, 0) == kCFCompareEqualTo)
     {
-        errno = CFErrorGetCode(err.get());
+        errno = static_cast<int>(CFErrorGetCode(err.get()));
         if(interrupted() || noBuffers())
         {
             return;
@@ -530,7 +532,7 @@ IceObjC::StreamTransceiver::checkErrorStatus(CFWriteStreamRef writeStream, CFRea
         }
     }
 
-    int error = CFErrorGetCode(err.get());
+    long error = CFErrorGetCode(err.get());
     if(error == kCFHostErrorHostNotFound || error == kCFHostErrorUnknown)
     {
         int rs = 0;
@@ -545,5 +547,5 @@ IceObjC::StreamTransceiver::checkErrorStatus(CFWriteStreamRef writeStream, CFRea
         }
         throw DNSException(file, line, rs, _host);
     }
-    throw CFNetworkException(file, line, CFErrorGetCode(err.get()), fromCFString(domain));
+    throw CFNetworkException(file, line, static_cast<int>(CFErrorGetCode(err.get())), fromCFString(domain));
 }
-- 
cgit v1.2.3