Changeset 5804

Timestamp:

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

Author:

landauf

Message:

added SmartPtr class

Location:

code/branches/core5/src/libraries/core

Files:

• CorePrereqs.h (modified) (2 diffs)
• OrxonoxClass.cc (modified) (2 diffs)
• OrxonoxClass.h (modified) (1 diff)
• SmartPtr.h (added)

code/branches/core5/src/libraries/core/CorePrereqs.h

@@ -155 +155 @@
     class ShellListener;
     template <class T>
+    class SmartPtr;
+    template <class T>
     class SubclassIdentifier;
     class TclBind;
@@ -162 +164 @@
     class TclThreadManager;
     class Template;
+    template <class T>
+    class WeakPtr;
     class WindowEventListener;
     class XMLFile;

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;
     }

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

@@ -54 +54 @@
         template <class T>
         friend class ClassIdentifier;
+
+        template <class T>
+        friend class SmartPtr;
 
         public: