summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Object.cpp
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2003-10-23 06:22:17 +0000
committerMichi Henning <michi@zeroc.com>2003-10-23 06:22:17 +0000
commit0fdb3361e7525f4f49556d1233d9b84c566ec6fb (patch)
treef128daba58f02bfc2c3a4d975c001eeab2562b43 /cpp/src/Ice/Object.cpp
parentfixes (diff)
downloadice-0fdb3361e7525f4f49556d1233d9b84c566ec6fb.tar.bz2
ice-0fdb3361e7525f4f49556d1233d9b84c566ec6fb.tar.xz
ice-0fdb3361e7525f4f49556d1233d9b84c566ec6fb.zip
- Renamed ObjectBase to GCShared.
- Fixed the problem of the gc test sometimes running for over three minutes. - Fixed race condition in printGCStats if a signal caused communicator shutdown.
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
-rw-r--r--cpp/src/Ice/Object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 205ec9a2f29..123370949ed 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -272,7 +272,7 @@ Ice::Object::__read(BasicStream* __is, bool __rid)
}
void
-Ice::Object::__gcReachable(::IceUtil::ObjectMultiSet& c) const
+Ice::Object::__gcReachable(::IceUtil::GCObjectMultiSet& c) const
{
::IceUtil::Mutex::Lock sync(_activeFacetMapMutex);