Changeset 2787 for code/trunk

Timestamp:

Mar 15, 2009, 3:24:37 PM (16 years ago)

Author:

rgrieder

Message:

Bugfix: _NDEBUG is never defined.

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -488 +488 @@
 
     // Note: These functions are placed in WorldEntity.h as inline functions for the release build.
-#ifndef _NDEBUG
+#ifndef NDEBUG
     const Vector3& WorldEntity::getPosition() const
     {

code/trunk/src/orxonox/objects/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#ifdef _NDEBUG
+#ifdef NDEBUG
 #include <OgreSceneNode.h>
 #else
@@ -419 +419 @@
 
     // 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(); }