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

1 files changed, 4 insertions, 3 deletions

diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index 70f48b781ac..1dfd7290b8f 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -570,11 +570,12 @@ Ice::stringToIdentity(const string& s)
     // Find unescaped separator; note that the string may contain an escaped
     // backslash before the separator.
     //
-    string::size_type slash = string::npos, pos = 0;
+    string::size_type slash = string::npos;
+    string::size_type pos = 0;
     while((pos = s.find('/', pos)) != string::npos)
     {
-        int escapes = 0;
-        while(static_cast<int>(pos) - escapes > 0 && s[pos - escapes - 1] == '\\')
+        string::size_type escapes = 0;
+        while(static_cast<int>(pos - escapes) > 0 && s[pos - escapes - 1] == '\\')
         {
             escapes++;
         }