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

Timestamp:

Sep 26, 2009, 11:16:49 PM (15 years ago)

Author:

landauf

Message:

added SmartPtr class

File:

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

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

@@ -52 +52 @@
     OrxonoxClass::~OrxonoxClass()
     {
+//        if (!this->requestedDestruction_)
+//            COUT(2) << "Warning: Destroyed object without destroy() (" << this->getIdentifier()->getName() << ")" << std::endl;
+
+        assert(this->referenceCount_ == 0);
+
         delete this->metaList_;
 
@@ -62 +67 @@
     void OrxonoxClass::destroy()
     {
-        if (this->referenceCount_ > 0)
-            this->requestedDestruction_ = true;
-        else
+        this->requestedDestruction_ = true;
+        if (this->referenceCount_ == 0)
             delete this;
     }