diff options
| author | Marco Nelissen <marcone@google.com> | 2011-06-06 09:55:15 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-06-06 09:55:15 -0700 |
| commit | b2fd84ad1d470d607af4a83da378d4e317421634 (patch) | |
| tree | 7f3004f80d6e46b33317676d8d11b79aa3c6bb69 /include | |
| parent | fc51aaec82ecedb554d158e4284761c9348d09fd (diff) | |
| parent | b9783b49f4727a0365f2297bb903db8682855adf (diff) | |
| download | frameworks_base-b2fd84ad1d470d607af4a83da378d4e317421634.zip frameworks_base-b2fd84ad1d470d607af4a83da378d4e317421634.tar.gz frameworks_base-b2fd84ad1d470d607af4a83da378d4e317421634.tar.bz2 | |
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/RefBase.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/utils/RefBase.h b/include/utils/RefBase.h index f355087..e88cb29 100644 --- a/include/utils/RefBase.h +++ b/include/utils/RefBase.h @@ -120,7 +120,14 @@ public: protected: RefBase(); virtual ~RefBase(); - + + // called when the last reference goes away. this is responsible for + // calling the destructor. The default implementation just does + // "delete this;". + // Make sure to never acquire a strong reference from this function. The + // same restrictions than for destructors apply. + virtual void destroy() const; + //! Flags for extendObjectLifetime() enum { OBJECT_LIFETIME_WEAK = 0x0001, |