Merge remote-tracking branch 'origin/3.7' into swift

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 9642c46617a..1ec6cb4dbf3 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1590,7 +1590,7 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa
             string message;
             while((rs = read(fds[0], &s, 16)) > 0)
             {
-                message.append(s, rs);
+                message.append(s, static_cast<size_t>(rs));
             }
 
             if(argv[0])
@@ -1866,8 +1866,8 @@ Ice::Service::runDaemon(int argc, char* argv[], const InitializationData& initDa
                     break;
                 }
             }
-            len -= n;
-            pos += n;
+            len -= static_cast<size_t>(n);
+            pos += static_cast<size_t>(n);
         }
         close(fds[1]);
     }