Changeset 871 for code/trunk/src/orxonox/core/Iterator.h

Timestamp:

Mar 9, 2008, 4:44:36 PM (16 years ago)

Author:

landauf

Message:

merged core branch to trunk

File:

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

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

@@ -26 +26 @@
  */
 
-/*!
+/**
     @file Iterator.h
     @brief Definition and implementation of the Iterator class.
@@ -71 +71 @@
             */
             Iterator(ObjectListElement<T>* element)
+            {
+                this->element_ = element;
+            }
+
+            /**
+                @brief Assigns an element to the iterator.
+                @param element The element
+            */
+            Iterator<T> operator=(ObjectListElement<T>* element)
             {
                 this->element_ = element;
@@ -150 +159 @@
                 @return True if the iterator points to an existing object.
             */
-            bool operator!=(int compare)
+            bool operator!=(ObjectListElement<T>* compare)
             {
-                // Comparing with anything except zero makes no sense
-                if (compare != 0)
-                    COUT(2) << "Warning: Comparing the " << ClassIdentifier<T>::getIdentifier()->getName() << "-List-Iterator with " << compare << " has no effect. Only comparison with 0 works." << std::endl;
-
-                return (this->element_ != 0);
+                return (this->element_ != compare);
             }