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

Timestamp:

Nov 20, 2007, 8:38:53 PM (16 years ago)

Author:

landauf

Message:

• *cough* fixed another small bug in the object-list *cough*

• made the object-list a template, to avoid a dynamic_cast in the Iterator

File:

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

code/branches/objecthierarchie/src/Iterator.h

@@ -10 +10 @@
             Iterator()
             {
-                this->elementForwards_ = ClassIdentifier<T>::getIdentifier()->objects_.first_;
-                this->elementBackwards_ = ClassIdentifier<T>::getIdentifier()->objects_.last_;
+                this->elementForwards_ = ClassIdentifier<T>::getIdentifier()->objects_s.first_;
+                this->elementBackwards_ = ClassIdentifier<T>::getIdentifier()->objects_s.last_;
                 this->iteratingForwards_ = true;
             }
@@ -51 +51 @@
             {
                 if (this->iteratingForwards_)
-                    return dynamic_cast<T*>(this->elementForwards_->object_);
+                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
                 else
-                    return dynamic_cast<T*>(this->elementBackwards_->object_);
+                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
             }
 
@@ -59 +59 @@
             {
                 if (this->iteratingForwards_)
-                    return dynamic_cast<T*>(this->elementForwards_->object_);
+                    return /*dynamic_cast<T*>*/(this->elementForwards_->object_);
                 else
-                    return dynamic_cast<T*>(this->elementBackwards_->object_);
+                    return /*dynamic_cast<T*>*/(this->elementBackwards_->object_);
 
             }
@@ -86 +86 @@
 
         private:
-            ObjectListElement* elementForwards_;
-            ObjectListElement* elementBackwards_;
+            ObjectListElement<T>* elementForwards_;
+            ObjectListElement<T>* elementBackwards_;
             bool iteratingForwards_;
     };