diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-10-23 00:10:22 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-10-23 00:10:22 +0000 |
| commit | ddd5ebec2740090133b84d08352f930ceb86f974 (patch) | |
| tree | b2630dbb3ab97e89cdf03d428401aa9990dfef32 /cpp/test | |
| parent | fixes (diff) | |
| download | ice-ddd5ebec2740090133b84d08352f930ceb86f974.tar.bz2 ice-ddd5ebec2740090133b84d08352f930ceb86f974.tar.xz ice-ddd5ebec2740090133b84d08352f930ceb86f974.zip | |
fixes for windows; other fixes
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/objects/AllTests.cpp | 26 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/Client.cpp | 1 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/TestI.cpp | 8 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/objectsCOL.dsp | 8 | ||||
| -rw-r--r-- | cpp/test/Ice/objects/objectsS.dsp | 8 |
5 files changed, 46 insertions, 5 deletions
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"
|