Changeset 225 for code/branches/objecthierarchie/src/Iterator.h

Timestamp:

Nov 20, 2007, 8:47:13 PM (16 years ago)

Author:

landauf

Message:

added ++it operator to the Iterator (because its faster than it++)

File:

• code/branches/objecthierarchie/src/Iterator.h (modified) (4 diffs)

code/branches/objecthierarchie/src/Iterator.h

@@ -28 +28 @@
             }
 
+            Iterator<T> operator++()
+            {
+                this->elementForwards_ = this->elementForwards_->next_;
+                return *this;
+            }
+
             Iterator<T> operator--(int step)
             {
@@ -44 +50 @@
                         this->elementBackwards_ = this->elementBackwards_->prev_;
                 }
+            }
 
-                return copy;
+            Iterator<T> operator--()
+            {
+                if (this->iteratingForwards_)
+                    this->iteratingForwards_ = false;
+                else
+                    this->elementBackwards_ = this->elementBackwards_->prev_;
+
+                return *this;
             }
 
@@ -51 +65 @@
             {
                 if (this->iteratingForwards_)
-                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
+                    return this->elementForwards_->object_;
                 else
-                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
+                    return this->elementBackwards_->object_;
             }
 
@@ -59 +73 @@
             {
                 if (this->iteratingForwards_)
-                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
+                    return this->elementForwards_->object_;
                 else
-                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
+                    return this->elementBackwards_->object_;
 
             }