diff options
| author | Michi Henning <michi@zeroc.com> | 2003-10-20 23:18:23 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-10-20 23:18:23 +0000 |
| commit | 8941640745d51e543fadc0524368d5f861691152 (patch) | |
| tree | 384020f2b665d7f1a1c20b5ea435e0bf74faf476 /cpp/include/Ice/Object.h | |
| parent | merging changes from garbage collector (diff) | |
| download | ice-8941640745d51e543fadc0524368d5f861691152.tar.bz2 ice-8941640745d51e543fadc0524368d5f861691152.tar.xz ice-8941640745d51e543fadc0524368d5f861691152.zip | |
merging changes for garbage collector
Diffstat (limited to 'cpp/include/Ice/Object.h')
| -rw-r--r-- | cpp/include/Ice/Object.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h index 228d75fb296..8c368cb8742 100644 --- a/cpp/include/Ice/Object.h +++ b/cpp/include/Ice/Object.h @@ -15,7 +15,7 @@ #ifndef ICE_OBJECT_H #define ICE_OBJECT_H -#include <IceUtil/Shared.h> +#include <IceUtil/ObjectBase.h> #include <IceUtil/Mutex.h> #include <Ice/ObjectF.h> #include <Ice/ProxyF.h> @@ -46,7 +46,7 @@ enum DispatchStatus namespace Ice { -class ICE_API Object : virtual public ::IceUtil::Shared +class ICE_API Object : virtual public ::IceUtil::ObjectBase { public: @@ -85,6 +85,9 @@ public: virtual void __write(::IceInternal::BasicStream*, bool) const; virtual void __read(::IceInternal::BasicStream*, bool = true); + virtual void __gcReachable(::IceUtil::ObjectMultiSet&) const; + virtual void __gcClear(); + void ice_addFacet(const ObjectPtr&, const ::std::string&); ObjectPtr ice_removeFacet(const ::std::string&); ObjectPtr ice_updateFacet(const ObjectPtr&, const ::std::string&); |