Refs #10311. Make reference counter more extensible.

MythTV · Jun 2, 2012 · 62d4299 · 62d4299
1 parent d6a4d9e
commit 62d4299
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/mythtv/libs/libmythbase/referencecounter.cpp b/mythtv/libs/libmythbase/referencecounter.cpp
@@ -23,7 +23,7 @@ ReferenceCounter::~ReferenceCounter(void)
     }
 }
 
-void ReferenceCounter::IncrRef(void)
+int ReferenceCounter::IncrRef(void)
 {
     int val = m_referenceCount.fetchAndAddRelease(1) + 1;
 
@@ -34,9 +34,11 @@ void ReferenceCounter::IncrRef(void)
     LOG(VB_REFCOUNT, LOG_DEBUG, QString("(0x%2)::IncrRef() -> %3")
         .arg(reinterpret_cast<intptr_t>(this),0,16).arg(val));
 #endif
+
+    return val;
 }
 
-bool ReferenceCounter::DecrRef(void)
+int ReferenceCounter::DecrRef(void)
 {
     int val = m_referenceCount.fetchAndAddRelaxed(-1) - 1;
 
@@ -51,8 +53,8 @@ bool ReferenceCounter::DecrRef(void)
     if (0 == val)
     {
         delete this;
-        return true;
+        return val;
     }
 
-    return false;
+    return val;
 }
diff --git a/mythtv/libs/libmythbase/referencecounter.h b/mythtv/libs/libmythbase/referencecounter.h
@@ -28,11 +28,12 @@ class MBASE_PUBLIC ReferenceCounter
     ReferenceCounter(const QString &debugName);
 
     /// Increments reference count.
-    void IncrRef(void);
+    /// \return last reference count
+    virtual int IncrRef(void);
 
     /// Decrements reference count and deletes on 0.
-    /// \return true if object is deleted
-    bool DecrRef(void);
+    /// \return last reference count, 0 if deleted
+    virtual int DecrRef(void);
 
   protected:
     /// Called on destruction, will warn if object deleted with