Context Navigation

worldentities

Timestamp:

Jun 14, 2009, 11:28:00 AM (16 years ago)

Author:

rgrieder

Message:

The usual convention with our headers is to use ≠ for all third party libraries.

Location:

code/branches/pch/src/orxonox/objects/worldentities

Files:

r3149	r3164
30	30
31	31	#include <OgreSceneNode.h>
32		#include ~~"BulletDynamics/Dynamics/btRigidBody.h"~~
	32	#include <BulletDynamics/Dynamics/btRigidBody.h>
33	33
34	34	#include "util/Debug.h"

r3149	r3164
31	31
32	32	#include <OgreSceneNode.h>
33		#include ~~"BulletDynamics/Dynamics/btRigidBody.h"~~
	33	#include <BulletDynamics/Dynamics/btRigidBody.h>
34	34
35	35	#include "util/OrxAssert.h"

r3163	r3164
33	33	#include <OgreSceneNode.h>
34	34	#include <OgreSceneManager.h>
35		#include ~~"BulletDynamics/Dynamics/btRigidBody.h"~~
	35	#include <BulletDynamics/Dynamics/btRigidBody.h>
36	36	#include <boost/static_assert.hpp>
37	37

-                      r3163
+                      r3164
 #include "OrxonoxPrereqs.h"
 #ifdef NDEBUG
+#if def NDEBUG
 #include <OgreSceneNode.h>
 #else
 #include <OgrePrerequisites.h>
 #endif
 #include "LinearMath/btMotionState.h"
+#include <LinearMath/btMotionState.h>
 #include "util/Math.h"
 …
     // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
 #ifdef NDEBUG
+#if def NDEBUG
     inline const Vector3& WorldEntity::getPosition() const
         { return this->node_->getPosition(); }

r3149	r3164
29	29	#include "SpaceShip.h"
30	30
31		#include ~~"BulletDynamics/Dynamics/btRigidBody.h"~~
	31	#include <BulletDynamics/Dynamics/btRigidBody.h>
32	32
33	33	#include "util/Math.h"

r2662	r3164
32	32	#include "OrxonoxPrereqs.h"
33	33
34		#include ~~"LinearMath/btVector3.h"~~
	34	#include <LinearMath/btVector3.h>
35	35
36	36	#include "Pawn.h"

Note: See TracChangeset for help on using the changeset viewer.