Changed inheritance of IceUtil::GCShared from IceUtil::Shared to virtual

    inheritance, so we don't have two IceUtil::Shared instances in a class
    that uses multiple inheritance and ends up deriving from
    IceUtil::Shared more than once.
Added a test case to the thread tests for a class that inherits from both
    GCShared and Thread to proved that there is indeed only one shared
    instance of IceUtil::Shared in such a class.

1 files changed, 2 insertions, 0 deletions

diff --git a/cpp/test/IceUtil/thread/TestSuite.cpp b/cpp/test/IceUtil/thread/TestSuite.cpp
index 2a9306b9b11..25ef15d8a5e 100644
--- a/cpp/test/IceUtil/thread/TestSuite.cpp
+++ b/cpp/test/IceUtil/thread/TestSuite.cpp
@@ -18,6 +18,7 @@
 #include <StartTest.h>
 #include <MonitorMutexTest.h>
 #include <MonitorRecMutexTest.h>
+#include <GCSharedTest.h>
 
 std::list<TestBasePtr> allTests;
 
@@ -34,4 +35,5 @@ initializeTestSuite()
     allTests.push_back(new StaticMutexTest);
     allTests.push_back(new MonitorMutexTest);
     allTests.push_back(new MonitorRecMutexTest);
+    allTests.push_back(new GCSharedTest);
 }