Changeset 1063 for code/trunk/src/core/Iterator.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/Iterator.h (modified) (8 diffs)

code/trunk/src/core/Iterator.h

@@ -65 +65 @@
             {
                 this->element_ = 0;
+                ClassManager<T>::getIdentifier()->getObjects()->registerIterator(this);
             }
 
@@ -74 +75 @@
             {
                 this->element_ = element;
+                ClassManager<T>::getIdentifier()->getObjects()->registerIterator(this);
+            }
+
+            /**
+                @brief Unregisters the Iterator from the ObjectList.
+            */
+            ~Iterator()
+            {
+                ClassManager<T>::getIdentifier()->getObjects()->unregisterIterator(this);
             }
 
@@ -91 +101 @@
             Iterator<T> operator++()
             {
-                this->element_ = this->element_->next_;
+                if (this->element_)
+                    this->element_ = this->element_->next_;
                 return *this;
             }
@@ -102 +113 @@
             {
                 Iterator<T> copy = *this;
-                this->element_ = this->element_->next_;
+                if (this->element_)
+                    this->element_ = this->element_->next_;
                 return copy;
             }
@@ -112 +124 @@
             Iterator<T> operator--()
             {
-                this->element_ = this->element_->prev_;
+                if (this->element_)
+                    this->element_ = this->element_->prev_;
                 return *this;
             }
@@ -123 +136 @@
             {
                 Iterator<T> copy = *this;
-                this->element_ = this->element_->prev_;
+                if (this->element_)
+                    this->element_ = this->element_->prev_;
                 return copy;
             }
@@ -133 +147 @@
             T* operator*()
             {
-                return this->element_->object_;
+                if (this->element_)
+                    return this->element_->object_;
+                else
+                    return 0;
             }
 
@@ -142 +159 @@
             T* operator->() const
             {
-                return this->element_->object_;
+                if (this->element_)
+                    return this->element_->object_;
+                else
+                    return 0;
 
             }