ref pointers

TODO: Cleanup

WeakRefBase lifetime is now controlled by a shared_ptr and a control block
objects now act like shared and weakptrs so they free themselves without any outside involvement, last of an objects reference goes out of scope object deletes.

Author: marauder2k7

Engine/source/console/simObject.h

@@ -1053,17 +1053,17 @@ class SimObjectPtr : public WeakRefPtr< T >
 
       typedef WeakRefPtr< T > Parent;
 
-      SimObjectPtr() {}
-      SimObjectPtr(T *ptr) { this->mReference = NULL; set(ptr); }
-      SimObjectPtr( const SimObjectPtr& ref ) { this->mReference = NULL; set(ref.mReference); }
+      SimObjectPtr() = default;
+      SimObjectPtr(T *ptr) { set(ptr); }
+      SimObjectPtr( const SimObjectPtr& ref ) { this->mReference = ref.mReference; }
 
       T* getObject() const { return Parent::getPointer(); }
 
-      ~SimObjectPtr() { set((WeakRefBase::WeakReference*)NULL); }
+      ~SimObjectPtr() { mReference = NULL; }
 
       SimObjectPtr<T>& operator=(const SimObjectPtr ref)
       {
-         set(ref.mReference);
+         mReference = ref.mReference;
          return *this;
       }
       SimObjectPtr<T>& operator=(T *ptr)
@@ -1073,31 +1073,10 @@ class SimObjectPtr : public WeakRefPtr< T >
       }
 
    protected:
-      void set(WeakRefBase::WeakReference * ref)
-      {
-         if( ref == this->mReference )
-            return;
-
-         if( this->mReference )
-         {
-            // Auto-delete
-            T* obj = this->getPointer();
-            if ( this->mReference->getRefCount() == 2 && obj && obj->isAutoDeleted() )
-               obj->deleteObject();
-
-            this->mReference->decRefCount();
-         }
-         this->mReference = NULL;
-         if( ref )
-         {
-            this->mReference = ref;
-            this->mReference->incRefCount();
-         }
-      }
 
       void set(T * obj)
       {
-         set(obj ? obj->getWeakReference() : (WeakRefBase::WeakReference *)NULL);
+         mReference = obj ? obj->getWeakReference() : nullptr;
       }
 };
 

Engine/source/core/util/refBase.cpp

@@ -3,7 +3,7 @@
 WeakRefBase::~WeakRefBase()
 {
    if (mControl)
-      mControl->object = nullptr;
+      mControl->object = NULL;
 }
 
 WeakControlBlock::WeakControlBlock(WeakRefBase* obj)
@@ -15,3 +15,7 @@ WeakControlBlock::~WeakControlBlock()
 {
 
 }
+
+WeakRefBase::WeakReference::~WeakReference()
+{
+}