Changeset 7271 for code/trunk/src/libraries/core/Iterator.h

Timestamp:

Aug 30, 2010, 8:07:38 PM (14 years ago)

Author:

rgrieder

Message:

There is no such word as "casted".
Also inserted 4 static_casts and replaced dynamic_cast with orxonox_cast in WeakPtr and SmartPtr.
Moreover found some weird code in Iterator.h with casting. Casting a NULL pointer always yields another NULL pointer.

File:

• code/trunk/src/libraries/core/Iterator.h (modified) (5 diffs)

code/trunk/src/libraries/core/Iterator.h

@@ -32 +32 @@
 
     The Iterator of a given class allows to iterate through an ObjectList. Objects in
-    this list are casted to the template argument of the Iterator.
+    this list are cast to the template argument of the Iterator.
 
     Usage:
@@ -95 +95 @@
             inline Iterator(ObjectListElement<O>* element)
             {
-                this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
+                this->element_ = element;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -107 +107 @@
             inline Iterator(const ObjectListIterator<O>& other)
             {
-                this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
+                this->element_ = other.element_;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -162 +162 @@
                     this->list_->unregisterIterator(this);
 
-                this->element_ = (element) ? static_cast<ObjectListBaseElement*>(element) : 0;
+                this->element_ = element;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);
@@ -179 +179 @@
                     this->list_->unregisterIterator(this);
 
-                this->element_ = (other.element_) ? static_cast<ObjectListBaseElement*>(other.element_) : 0;
+                this->element_ = other.element_;
                 this->list_ = ClassIdentifier<O>::getIdentifier()->getObjects();
                 this->list_->registerIterator(this);