Changeset 9597 for code/branches/core6/src/libraries/core/object/Listable.cc

Timestamp:

Mar 29, 2013, 11:44:22 AM (11 years ago)

Author:

landauf

Message:

removed MetaObjectList. replaced it by std::vector because object list elements can now remove themselves from their lists.

File:

• code/branches/core6/src/libraries/core/object/Listable.cc (modified) (2 diffs)

code/branches/core6/src/libraries/core/object/Listable.cc

@@ -33 +33 @@
 
 #include "Listable.h"
-
-#include "core/object/MetaObjectList.h"
+#include "ObjectListBase.h"
 
 namespace orxonox
 {
     /**
-        @brief Constructor: creates the meta-object-list.
+        @brief Constructor: Allocates space in the element list.
     */
     Listable::Listable()
     {
-        this->metaList_ = new MetaObjectList();
+        this->elements_.reserve(6);
     }
 
@@ -59 +58 @@
     void Listable::unregisterObject()
     {
-        if (this->metaList_)
-            delete this->metaList_;
-        this->metaList_ = 0;
+        for (size_t i = 0; i < this->elements_.size(); ++i)
+            delete this->elements_[i];
+        this->elements_.clear();
     }
 }