[Orxonox-commit 90] r2787 - trunk/src/orxonox/objects/worldentities

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-03-15 14:24:37 +0000 (Sun, 15 Mar 2009)
New Revision: 2787

Modified:
   trunk/src/orxonox/objects/worldentities/WorldEntity.cc
   trunk/src/orxonox/objects/worldentities/WorldEntity.h
Log:
Bugfix: _NDEBUG is never defined.

Modified: trunk/src/orxonox/objects/worldentities/WorldEntity.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/WorldEntity.cc	2009-03-15 11:55:45 UTC (rev 2786)
+++ trunk/src/orxonox/objects/worldentities/WorldEntity.cc	2009-03-15 14:24:37 UTC (rev 2787)
@@ -487,7 +487,7 @@
     }
 
     // Note: These functions are placed in WorldEntity.h as inline functions for the release build.
-#ifndef _NDEBUG
+#ifndef NDEBUG
     const Vector3& WorldEntity::getPosition() const
     {
         return this->node_->getPosition();

Modified: trunk/src/orxonox/objects/worldentities/WorldEntity.h
===================================================================
--- trunk/src/orxonox/objects/worldentities/WorldEntity.h	2009-03-15 11:55:45 UTC (rev 2786)
+++ trunk/src/orxonox/objects/worldentities/WorldEntity.h	2009-03-15 14:24:37 UTC (rev 2787)
@@ -32,7 +32,7 @@
 
 #include "OrxonoxPrereqs.h"
 
-#ifdef _NDEBUG
+#ifdef NDEBUG
 #include <OgreSceneNode.h>
 #else
 #include <OgrePrerequisites.h>
@@ -418,11 +418,11 @@
     };
 
     // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
-#ifdef _NDEBUG
+#ifdef NDEBUG
     inline const Vector3& WorldEntity::getPosition() const
         { return this->node_->getPosition(); }
     inline const Quaternion& WorldEntity::getOrientation() const
-        { return this->node_->getrOrientation(); }
+        { return this->node_->getOrientation(); }
     inline const Vector3& WorldEntity::getScale3D(void) const
         { return this->node_->getScale(); }
 #endif