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

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/coord/p_node.cc (modified) (9 diffs)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -22 +22 @@
 #include "p_node.h"
 #include "stdincl.h"
+#include "compiler.h"
 
 #include "error.h"
@@ -61 +62 @@
   *this->absCoordinate = absCoordinate;
 
-  __LIKELY_IF(parent != NULL)
+  if (likely(parent != NULL))
   {
     *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
@@ -208 +209 @@
 {
 
-  __UNLIKELY_IF( this->bAbsCoorChanged)
+  if( unlikely(this->bAbsCoorChanged))
     {
       *this->absCoordinate = *this->absCoordinate + shift;
@@ -316 +317 @@
 void PNode::addChild (PNode* pNode, int parentingMode)
 {
-  __LIKELY_IF( pNode->parent != NULL)
+  if( likely(pNode->parent != NULL))
     {
       PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
@@ -436 +437 @@
 
 
-  __LIKELY_IF( this->mode & PNODE_MOVEMENT)
+  if( likely(this->mode & PNODE_MOVEMENT))
     {
-      __UNLIKELY_IF(this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      __LIKELY_IF(this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
 
         {
@@ -449 +450 @@
 
           /*
-          __UNLIKELY_IF( this->parent == NULL)
+          if( unlikely(this->parent == NULL))
             {
               *this->absCoordinate = *this->relCoordinate;
@@ -460 +461 @@
   if( this->mode & PNODE_LOCAL_ROTATE)
     {
-      __UNLIKELY_IF( this->bAbsDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relDirection = *this->absDirection - parent->getAbsDir();
         }
-      else __LIKELY_IF( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else if( likely(this->bRelDirChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* update the current absDirection - remember * means rotation around sth.*/
@@ -474 +475 @@
   if( this->mode & PNODE_ROTATE_MOVEMENT)
     {
-      __UNLIKELY_IF( this->bAbsCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      if( unlikely(this->bAbsCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* if you have set the absolute coordinates this overrides all other changes */
           *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
-      else __LIKELY_IF( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
+      else if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /*this is bad style... must be deleted later - just for testing*/
@@ -496 +497 @@
     { 
       /* if this node has changed, make sure, that all children are updated also */
-      __LIKELY_IF( this->bRelCoorChanged || this->bAbsCoorChanged)
+      if( likely(this->bRelCoorChanged || this->bAbsCoorChanged))
         pn->parentCoorChanged ();
-      __LIKELY_IF( this->bRelDirChanged || this->bAbsDirChanged)
+      if( likely(this->bRelDirChanged || this->bAbsDirChanged))
         pn->parentDirChanged ();