Making SelfDestroy virtual, remove final for RefCountersImpl.

Author: hzqst

Common/interface/RefCountedObjectImpl.hpp

@@ -215,15 +215,14 @@ class RefCountersImpl : public IReferenceCounters
         return m_NumWeakReferences.load();
     }
 
-protected:
+private:
     template <typename AllocatorType, typename ObjectType>
     friend class MakeNewRCObj;
 
     RefCountersImpl() noexcept
     {
     }
 
-private:
     class ObjectWrapperBase
     {
     public:
@@ -449,16 +448,17 @@ class RefCountersImpl : public IReferenceCounters
         }
     }
 
-protected:
-    virtual void SelfDestroy() = 0;
+    virtual void SelfDestroy()
+    {
+        delete this;
+    }
 
     ~RefCountersImpl()
     {
         VERIFY(m_NumStrongReferences.load() == 0 && m_NumWeakReferences.load() == 0,
                "There exist outstanding references to the object being destroyed");
     }
 
-private:
     // No copies/moves
     // clang-format off
     RefCountersImpl             (const RefCountersImpl&)  = delete;
@@ -492,21 +492,6 @@ class RefCountersImpl : public IReferenceCounters
     std::atomic<ObjectState> m_ObjectState{ObjectState::NotInitialized};
 };
 
-class RefCountersAllocationImpl final : public RefCountersImpl
-{
-private:
-    template <typename AllocatorType, typename ObjectType>
-    friend class MakeNewRCObj;
-
-    RefCountersAllocationImpl() noexcept
-    {
-    }
-
-    void SelfDestroy() override final
-    {
-        delete this;
-    }
-};
 
 /// Base class for all reference counting objects
 template <typename Base>
@@ -669,7 +654,7 @@ class MakeNewRCObj
         {
             // Constructor of RefCountersImpl class is private and only accessible
             // by methods of MakeNewRCObj
-            pNewRefCounters = new RefCountersAllocationImpl{};
+            pNewRefCounters = new RefCountersImpl{};
             pRefCounters    = pNewRefCounters;
         }
         ObjectType* pObj = nullptr;

Primitives/interface/ReferenceCounters.h

@@ -44,8 +44,6 @@ typedef Int32 ReferenceCounterValueType;
 class IReferenceCounters
 {
 public:
-    virtual ~IReferenceCounters(){};
-
     /// Increments the number of strong references by 1.
 
     /// \return The number of strong references after incrementing the counter.