Changeset 9570 for code/branches/core6/src/libraries/core/class/OrxonoxClass.cc

Timestamp:

Mar 24, 2013, 8:51:37 PM (11 years ago)

Author:

landauf

Message:

moved functions and attributes needed to safely destroy objects from OrxonoxClass to Destroyable

File:

• code/branches/core6/src/libraries/core/class/OrxonoxClass.cc (modified) (3 diffs)

code/branches/core6/src/libraries/core/class/OrxonoxClass.cc

@@ -35 +35 @@
 
 #include <cassert>
-#include "core/object/MetaObjectList.h"
-#include "core/object/Context.h"
-#include "Identifier.h"
 
 namespace orxonox
@@ -46 +43 @@
     OrxonoxClass::OrxonoxClass()
     {
-        this->referenceCount_ = 0;
-        this->requestedDestruction_ = false;
     }
 
@@ -55 +50 @@
     OrxonoxClass::~OrxonoxClass()
     {
-        assert(this->referenceCount_ <= 0);
-
-        // notify all destruction listeners
-        for (std::set<DestructionListener*>::iterator it = this->destructionListeners_.begin(); it != this->destructionListeners_.end(); )
-            (*(it++))->objectDeleted();
-    }
-
-    /**
-        @brief Deletes the object if no @ref orxonox::SmartPtr "smart pointers" point to this object. Otherwise schedules the object to be deleted as soon as possible.
-    */
-    void OrxonoxClass::destroy()
-    {
-        assert(this); // Just in case someone tries to delete a NULL pointer
-        this->requestedDestruction_ = true;
-        if (this->referenceCount_ == 0)
-        {
-            this->preDestroy();
-            if (this->referenceCount_ == 0)
-                delete this;
-        }
     }
 }