Changeset 3860 in orxonox.OLD for orxonox/trunk/src/lib/util

Timestamp:

Apr 17, 2005, 6:20:02 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: moved likely to compiler.h in defs
also reset all the UNLIKELY_IF functions to how they should look.

the old approach is still valid, but depricated.

@patrick: i hope this is ok for you, for it is LINUX-standard.
and i think windows is also able to handle likely/unlikely because it is a compiler issue not a system issue

File:

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

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

@@ -3 +3 @@
 #define _LIST_H
 
-#include "stdincl.h"
+#include "compiler.h"
+#ifndef NULL
+#define NULL 0
+#endif
 
 //! An enum to list all the modes available when adding an object to a List
@@ -38 +41 @@
     listElement* next;
   };
-  Uint32 size;
+  unsigned int size;
   listElement* first;
   listElement* last;
@@ -118 +121 @@
 
  private:
-  Uint32 size;
+  unsigned int size;
   listElement<T>* first;
   listElement<T>* last;
@@ -153 +156 @@
 inline void tList<T>::add(T* entity)
 {
-  __UNLIKELY_IF( entity == NULL) return;
+  if( unlikely(entity == NULL)) return;
   listElement<T>* el = new listElement<T>;
   el->prev = this->last;
@@ -161 +164 @@
   this->last = el;
 
-  __UNLIKELY_IF(el->prev == NULL) this->first = el; /* if first element */
+  if( unlikely(el->prev == NULL)) this->first = el; /* if first element */
   else el->prev->next = el;
   this->size++;
@@ -174 +177 @@
   while( this->currentEl != NULL)
     {
-      __UNLIKELY_IF( this->currentEl->curr == entity)
+      if( unlikely(this->currentEl->curr == entity))
         { 
-          __UNLIKELY_IF( this->currentEl->prev  == NULL ) this->first = this->currentEl->next;
+          if( unlikely(this->currentEl->prev  == NULL)) this->first = this->currentEl->next;
           else this->currentEl->prev->next = this->currentEl->next;
 
-          __UNLIKELY_IF( this->currentEl->next == NULL) this->last = this->currentEl->prev;
+          if( unlikely(this->currentEl->next == NULL)) this->last = this->currentEl->prev;
           else this->currentEl->next->prev = this->currentEl->prev;