Changeset 5791 for code/branches/core5/src/libraries/core/OrxonoxClass.cc

Timestamp:

Sep 26, 2009, 2:05:30 AM (15 years ago)

Author:

landauf

Message:

Added destroy() function to OrxonoxClass.
Removed destroy() functions from some subclasses.
Expanded Timer to accept Functors of other classes too.

File:

• code/branches/core5/src/libraries/core/OrxonoxClass.cc (modified) (2 diffs)

code/branches/core5/src/libraries/core/OrxonoxClass.cc

@@ -45 +45 @@
         this->parents_ = 0;
         this->metaList_ = new MetaObjectList();
+        this->referenceCount_ = 0;
+        this->requestedDestruction_ = false;
     }
 
@@ -55 +57 @@
         if (this->parents_)
             delete this->parents_;
+    }
+
+    /** @brief Deletes the object if no smart pointers point to this object. Otherwise schedules the object to be deleted as soon as possible. */
+    void OrxonoxClass::destroy()
+    {
+        if (this->referenceCount_ > 0)
+            this->requestedDestruction_ = true;
+        else
+            delete this;
     }