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

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

Location:

orxonox/trunk/src/lib/math

Files:

• vector.cc (modified) (3 diffs)
• vector.h (modified) (2 diffs)

orxonox/trunk/src/lib/math/vector.cc

@@ -1 @@
-
-
 /* 
    orxonox - the future of 3D-vertical-scrollers
@@ -66 +64 @@
 Vector Vector::operator/ (float f) const
 {
-  __UNLIKELY_IF( f == 0.0)
+  if( unlikely(f == 0.0))
   {
     // Prevent divide by zero
@@ -105 +103 @@
 {
   float l = len();
-  __UNLIKELY_IF(l != 1.0)
+  if(unlikely(l != 1.0))
     {
       return this;
     }
-  else __UNLIKELY_IF(l == 0.0)
+  else if(unlikely(l == 0.0))
     {
       return 0;

orxonox/trunk/src/lib/math/vector.h

@@ -10 +10 @@
 
 #include <math.h>
-#include "stdincl.h"
+#include "compiler.h"
 //! PI the circle-constant
 #define PI 3.14159265359f
@@ -41 +41 @@
   inline void normalize() { 
                       float l = len(); 
-                      __UNLIKELY_IF( l == 0.0) 
+                      if( unlikely(l == 0.0)) 
                         { 
                           // Prevent divide by zero