diff options
| author | Michi Henning <michi@zeroc.com> | 2003-10-23 06:22:17 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-10-23 06:22:17 +0000 |
| commit | 0fdb3361e7525f4f49556d1233d9b84c566ec6fb (patch) | |
| tree | f128daba58f02bfc2c3a4d975c001eeab2562b43 /cpp/src/slice2cpp | |
| parent | fixes (diff) | |
| download | ice-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/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 876500ab25f..697e9846794 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2606,9 +2606,9 @@ Slice::Gen::ObjectVisitor::emitGCFunctions(const ClassDefPtr& p) ClassList bases = p->bases(); DataMemberList dataMembers = p->dataMembers(); - H << nl << "virtual void __gcReachable(::IceUtil::ObjectMultiSet&) const;"; + H << nl << "virtual void __gcReachable(::IceUtil::GCObjectMultiSet&) const;"; - C << sp << nl << "void" << nl << scoped.substr(2) << "::__gcReachable(::IceUtil::ObjectMultiSet& _c) const"; + C << sp << nl << "void" << nl << scoped.substr(2) << "::__gcReachable(::IceUtil::GCObjectMultiSet& _c) const"; C << sb; if(bases.empty() || bases.front()->isInterface()) { |