Changeset 3654 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Mar 25, 2005, 6:47:26 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: altered the list function to make it more performant the world now uses iterators everywhere.

File:

• orxonox/trunk/src/lib/util/list.h (modified) (3 diffs)

orxonox/trunk/src/lib/util/list.h

@@ -87 +87 @@
 inline T* tIterator<T>::nextElement ()
 {
-  if( this->currentEl == NULL)
-    {
-      PRINTF(1)("Iterator has not been initialized - there is no currentEl\n");
+  if( this->currentEl == NULL || this->currentEl->next == NULL) /* don't turn it the other way or it will give segfaults! */
       return NULL;
-    }
   if( this->currentEl == this->firstEl)
     {
       this->currentEl = this->currentEl->next;
-      return this->firstEl->curr;
-    }
-  if( this->currentEl->next == NULL)
-    return NULL;
+      return this->firstEl->curr; /* if its the first element, don't return second element*/
+    }
   this->currentEl = this->currentEl->next;
   return this->currentEl->curr;
@@ -126 +121 @@
 
  private:
-
   Uint32 size;
   listElement<T>* first;
   listElement<T>* last;
   listElement<T>* currentEl;
-
 };
 
@@ -255 +248 @@
 inline tIterator<T>* tList<T>::getIterator()
 {
-  if( this->size == 0) return NULL;
   tIterator<T>* iterator = new tIterator<T>(this->first);
   return iterator;