Changeset 9667 for code/trunk/src/libraries/core/class/Identifiable.cc

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/class (copied) (copied from code/branches/core6/src/libraries/core/class)
• src/libraries/core/class/Identifiable.cc (modified) (3 diffs)

code/trunk/src/libraries/core/class/Identifiable.cc

@@ -35 +35 @@
 
 #include <cassert>
+#include "core/CoreIncludes.h"
 #include "core/object/Context.h"
 #include "Identifier.h"
@@ -40 +41 @@
 namespace orxonox
 {
+    RegisterClassNoArgs(Identifiable);
+
     /**
         @brief Constructor: Sets the default values.
@@ -46 +49 @@
     {
         this->identifier_ = 0;
-        this->parents_ = 0;
-        // Optimisation
-        this->objectPointers_.reserve(6);
-    }
+        this->objectPointers_.reserve(6); // Optimisation
 
-    /**
-        @brief Destructor: Removes the object from the object-lists
-    */
-    Identifiable::~Identifiable()
-    {
-        // parents_ exists only if isCreatingHierarchy() of the associated Identifier returned true while creating the class
-        if (this->parents_)
-            delete this->parents_;
+        RegisterObject(Identifiable);
     }