Changeset 1063 for code/trunk/src/core/MetaObjectList.h

Timestamp:

Apr 14, 2008, 6:23:52 PM (16 years ago)

Author:

landauf

Message:

fixed an interesting bug in ObjectList/MetaObjectList/Iterator: it's now possible to delete multiple objects in one function-call while iterating through the objects. (and it would have crashed with std::list as well, so no stupid comments please )

added a feature in Timer.cc, allowing timers to tick faster than orxonox. this is from core2-branch but got lost while merging.

File:

• code/trunk/src/core/MetaObjectList.h (modified) (3 diffs)

code/trunk/src/core/MetaObjectList.h

@@ -89 +89 @@
     MetaObjectListElement<T>::~MetaObjectListElement()
     {
+        COUT(5) << "*** MetaObjectList: Removing Object from " << ClassManager<T>::getIdentifier()->getName() << "-list." << std::endl;
+        this->list_->notifyIterators(this->element_);
+
         if (this->element_->next_)
             this->element_->next_->prev_ = this->element_->prev_;
@@ -99 +102 @@
             this->list_->first_ = this->element_->next_; // If there is no prev_, we deleted the first object and have to update the first_ pointer of the list
 
-
-        COUT(5) << "*** MetaObjectList: Removing Object from " << ClassManager<T>::getIdentifier()->getName() << "-list." << std::endl;
         delete this->element_;
     }
@@ -106 +107 @@
 
     // ###############################
-    // ###       ObjectList        ###
+    // ###     MetaObjectList      ###
     // ###############################
     //!  The MetaObjectList contains ObjectListElements and their ObjectLists.