Changeset 3661 in orxonox.OLD for orxonox/trunk/src/lib/util/list.h

Timestamp:

Mar 29, 2005, 10:34:25 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some changes in the benchmark routines and in the list. list is now more efficent than ever and is integrated in the benchmark system.

File:

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

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

@@ -66 +66 @@
   listElement<T>* currentEl;
   listElement<T>* firstEl;
+  int counter;
 };
 
@@ -74 +75 @@
   this->currentEl = startElement;
   this->firstEl = startElement;
+  this->counter = -1;
 }
 
@@ -87 +89 @@
 inline T* tIterator<T>::nextElement ()
 {
-  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 its the first element, don't return second element*/
-    }
+  this->counter++;
+  if( this->counter == 0)
+    return this->firstEl->curr;
+  
+  if( this->currentEl->next == NULL || this->currentEl == NULL)
+    return NULL;
+
   this->currentEl = this->currentEl->next;
   return this->currentEl->curr;
@@ -154 +156 @@
 
 template<class T>
-void tList<T>::add(T* entity)
+inline void tList<T>::add(T* entity)
 {
   if( entity == NULL) return;
@@ -171 +173 @@
 
 template<class T>
-void tList<T>::remove(T* entity)
+inline void tList<T>::remove(T* entity)
 {
   if( entity == NULL) return;