5 files changed, 27 insertions, 11 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index b27db926094..06ceeea348d 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -905,6 +905,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name icecpp
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adapterDeactivationC
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adapterDeactivationCOL
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name adapterDeactivationS
+    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 4cc254924da..45c4398effc 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -20,8 +20,8 @@ import sys, os
 # protocol. Otherwise TCP is used.
 #
 
-protocol = "ssl"
-#protocol = ""
+#protocol = "ssl"
+protocol = ""
 
 #
 # Set compressed to 1 in case you want to run the tests with
diff --git a/cpp/include/Slice/Preprocessor.h b/cpp/include/Slice/Preprocessor.h
index 05342049b6f..54787d05fd0 100644
--- a/cpp/include/Slice/Preprocessor.h
+++ b/cpp/include/Slice/Preprocessor.h
@@ -49,7 +49,6 @@ private:
     const std::string _fileName;
     const std::string _args;
     FILE* _cppHandle;
-
 };
 
 }
diff --git a/cpp/src/IceUtil/UUID.cpp b/cpp/src/IceUtil/UUID.cpp
index e3794c4d225..4c962dcd047 100644
--- a/cpp/src/IceUtil/UUID.cpp
+++ b/cpp/src/IceUtil/UUID.cpp
@@ -13,6 +13,7 @@
 // **********************************************************************
 
 #include <IceUtil/UUID.h>
+#include <IceUtil/Unicode.h>
 
 #ifdef _WIN32
 #   include <rpc.h>
@@ -32,16 +33,23 @@ IceUtil::generateUUID()
 
     UUID uuid;
     UuidCreate(&uuid);
-
-#if _MSC_VER == 1200
-    unsigned char* str;
+
+#if _MSC_VER > 1200
+    wchar_t* str;
 #else
-    unsigned short* str;    // Type has changed for some reason in VC++ 2002 (but doc still
-#endif			    // says it's unsigned char *...)
+    unsigned char* str;
+#endif
 
     UuidToString(&uuid, &str);
 
-    string result(reinterpret_cast<char*>(str));
+    string result;
+
+#if _MSC_VER > 1200
+    result = wstringToString(wstring(str));
+#else
+    result = reinterpret_cast<char*>(str);
+#endif
+
     RpcStringFree(&str);
     return result;
     
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 5655da7e421..6d4ff64d2f6 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -3516,7 +3516,7 @@ Slice::Unit::setComment(const string& comment)
 string
 Slice::Unit::currentComment()
 {
-    string comment;
+    string comment = "";
     comment.swap(_currentComment);
     return comment;
 }
@@ -3600,7 +3600,7 @@ Slice::Unit::scanPosition(const char* s)
 	    {
 		--_currentIncludeLevel;
 	    }
-	    _currentComment.erase();
+	    _currentComment = "";
 	}
 	else
 	{