fixes for windows; other fixes

7 files changed, 110 insertions, 6 deletions

diff --git a/cpp/all.dsw b/cpp/all.dsw
index 64a8bd4458e..de0aa08bab4 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -275,6 +275,15 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name facetsS

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name objectsC

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name objectsCOL

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name objectsS

+    End Project Dependency

 }}}

 

 ###############################################################################

@@ -633,6 +642,60 @@ Package=<4>
 

 ###############################################################################

 

+Project: "objectsC"=.\test\Ice\objects\objectsC.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "objectsCOL"=.\test\Ice\objects\objectsCOL.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "objectsS"=.\test\Ice\objects\objectsS.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

+###############################################################################

+

 Project: "operationsC"=.\test\Ice\operations\operationsC.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index ebeb1c685bf..d5014036981 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -899,7 +899,7 @@ IceInternal::BasicStream::throwException(const char** throwsBegin, const char**
 	{
 	    for (const char** p = ex.__getExceptionIds(); strcmp(*p, "::Ice::UserException") != 0; ++p)
 	    {
-		if (binary_search(throwsBegin, throwsEnd, *p))
+		if (binary_search(throwsBegin, throwsEnd, string(*p)))
 		{
 		    ex.__read(this);
 		    ex._throw();
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index c78c56e0a22..a3541931c0f 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -189,5 +189,31 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(fd->c == 0);
     cout << "ok" << endl;
 
+    //
+    // Break cyclic dependencies
+    //
+    b1->a = 0;
+    b1->b = 0;
+    b1->c = 0;
+    b1->_removeAllFacets();
+    b1 = 0;
+    fb1 = 0;
+    b2->a = 0;
+    b2->b = 0;
+    b2->c = 0;
+    b2->_removeAllFacets();
+    b2 = 0;
+    fb2 = 0;
+    c->b = 0;
+    c->_removeAllFacets();
+    c = 0;
+    fc = 0;
+    d->a = 0;
+    d->b = 0;
+    d->c = 0;
+    d->_removeAllFacets();
+    d = 0;
+    fd = 0;
+
     return initial;
 }
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index d9a019848cd..2c7f2b27ccd 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -33,6 +33,7 @@ public:
 	    return new D;
 	}
 	assert(false); // Should never be reached
+	return 0;
     }
 
     virtual void destroy()
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 124e136fba3..495e0c67e9f 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -38,24 +38,22 @@ InitialI::shutdown()
 {
     _adapter->getCommunicator()->shutdown();
 
-    // Remove cyclic dependencies
-
+    //
+    // Break cyclic dependencies
+    //
     _b1->a = 0;
     _b1->b = 0;
     _b1->c = 0;
     _b1->_removeAllFacets();
     _b1 = 0;
-
     _b2->a = 0;
     _b2->b = 0;
     _b2->c = 0;
     _b2->_removeAllFacets();
     _b2 = 0;
-
     _c->b = 0;
     _c->_removeAllFacets();
     _c = 0;
-
     _d->a = 0;
     _d->b = 0;
     _d->c = 0;
diff --git a/cpp/test/Ice/objects/objectsCOL.dsp b/cpp/test/Ice/objects/objectsCOL.dsp
index e6a2ab98658..6650e4004cc 100644
--- a/cpp/test/Ice/objects/objectsCOL.dsp
+++ b/cpp/test/Ice/objects/objectsCOL.dsp
@@ -99,6 +99,10 @@ SOURCE=.\Collocated.cpp
 

 SOURCE=.\Test.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\TestI.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -107,6 +111,10 @@ SOURCE=.\Test.cpp
 

 SOURCE=.\Test.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\TestI.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/cpp/test/Ice/objects/objectsS.dsp b/cpp/test/Ice/objects/objectsS.dsp
index 3fd63cebf42..8a7f4a0ff7b 100644
--- a/cpp/test/Ice/objects/objectsS.dsp
+++ b/cpp/test/Ice/objects/objectsS.dsp
@@ -95,6 +95,10 @@ SOURCE=.\Server.cpp
 

 SOURCE=.\Test.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\TestI.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -103,6 +107,10 @@ SOURCE=.\Test.cpp
 

 SOURCE=.\Test.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\TestI.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"