3 files changed, 53 insertions, 1 deletions
diff --git a/cpp/all.dsw b/cpp/all.dsw
index 250a45cccb6..bf3d5e3f7b3 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -218,6 +218,15 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name asyncFHTS
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Freeze
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name phonebookC
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name phonebookS
+    End Project Dependency
 }}}
 
 ###############################################################################
@@ -489,6 +498,42 @@ Package=<4>
 
 ###############################################################################
 
+Project: "phonebookC"=.\demo\Freeze\phonebook\phonebookC.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Freeze
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Ice
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "phonebookS"=.\demo\Freeze\phonebook\phonebookS.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name Freeze
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Ice
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "pickleR"=.\demo\Ice\pickle\pickleR.dsp - Package Owner=<4>
 
 Package=<5>
diff --git a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
index 40e51a1cb49..eaf0a610644 100644
--- a/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
+++ b/cpp/demo/Freeze/phonebook/PhoneBookI.cpp
@@ -105,9 +105,15 @@ PhoneBookI::createEntry()
 {
     JTCSyncT<JTCRecursiveMutex> sync(*this);
     
+#ifdef WIN32 // COMPILERBUG
+    char s[20];
+    sprintf(s, "%I64d", _nextEntryIdentity++);
+    string identity = s;
+#else
     ostringstream s;
     s << _nextEntryIdentity++;
     string identity = s.str();
+#endif
     
     add(identity, L"");
 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index d2984e60190..bf0a68c272a 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -27,7 +27,8 @@
 #   pragma warning( disable : 4250 )
 // non dll-interface class ... used as base for dll-interface class ...
 #   pragma warning( disable : 4275 )
-
+//  ...: decorated name length exceeded, name was truncated
+#   pragma warning( disable : 4503 )  
 
 #elif defined(__linux__) && defined(i386)