From 6db8c505398a0979853f6c166e0a8bcafd9268f8 Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Thu, 19 May 2011 18:03:31 -0700 Subject: RefBase subclasses can now decide how they want to be destroyed. This adds a destroy() virtual on RefBase which sublasses can implement. destroy() is called in lieu of the destructor whenthe last strong ref goes away. --- libs/utils/RefBase.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libs/utils/RefBase.cpp') diff --git a/libs/utils/RefBase.cpp b/libs/utils/RefBase.cpp index 2034486aacf2..9f55a71579d4 100644 --- a/libs/utils/RefBase.cpp +++ b/libs/utils/RefBase.cpp @@ -345,6 +345,10 @@ void RefBase::incStrong(const void* id) const const_cast(this)->onFirstRef(); } +void RefBase::destroy() const { + delete this; +} + void RefBase::decStrong(const void* id) const { weakref_impl* const refs = mRefs; @@ -357,7 +361,7 @@ void RefBase::decStrong(const void* id) const if (c == 1) { const_cast(this)->onLastStrongRef(id); if ((refs->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) { - delete this; + destroy(); } } refs->decWeak(id); -- cgit v1.2.3-59-g8ed1b