Bug 3832 - slice conmpiler issues with UNC paths

2 files changed, 15 insertions, 2 deletions

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 29c968f9f93..ca2c2827dc6 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -89,8 +89,19 @@ Slice::Preprocessor::normalizeIncludePath(const string& path)
 
     replace(result.begin(), result.end(), '\\', '/');
 
+    string::size_type startReplace = 0;
+#ifdef _WIN32
+    //
+    // For UNC paths we need to ensure they are in the format that is
+    // used by MCPP. IE. "//MACHINE/PATH"
+    //
+    if(result.find("//") == 0)
+    {
+        startReplace = 2;
+    }
+#endif
     string::size_type pos;
-    while((pos = result.find("//")) != string::npos)
+    while((pos = result.find("//", startReplace)) != string::npos)
     {
         result.replace(pos, 2, "/");
     }
diff --git a/cpp/src/Slice/Util.cpp b/cpp/src/Slice/Util.cpp
index dffbef6523b..916bebbea03 100644
--- a/cpp/src/Slice/Util.cpp
+++ b/cpp/src/Slice/Util.cpp
@@ -26,8 +26,9 @@ static string
 normalizePath(const string& path)
 {
     string result = path;
+
     replace(result.begin(), result.end(), '\\', '/');
-    string::size_type pos;
+
     string::size_type startReplace = 0;
 #ifdef _WIN32
     //
@@ -39,6 +40,7 @@ normalizePath(const string& path)
         startReplace = 2;
     }
 #endif
+    string::size_type pos;
     while((pos = result.find("//", startReplace)) != string::npos)
     {
         result.replace(pos, 2, "/");