diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 14:41:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-23 14:41:31 +0400 |
commit | b8e019d8396ed102323df234df8b1cc6b35712a1 (patch) | |
tree | 64f4fdb413336113b8c92198097831941c6fc171 /source/gameengine/Physics | |
parent | 3dd449ae4fbb2eb6f9eb63e9f9de61def58abe16 (diff) |
use __ prefix on header guards to avoid mixing up defines with api functions / classes.
Diffstat (limited to 'source/gameengine/Physics')
12 files changed, 35 insertions, 35 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdGraphicController.h b/source/gameengine/Physics/Bullet/CcdGraphicController.h index d0cb899cb74..07878b7162e 100644 --- a/source/gameengine/Physics/Bullet/CcdGraphicController.h +++ b/source/gameengine/Physics/Bullet/CcdGraphicController.h @@ -18,8 +18,8 @@ subject to the following restrictions: */ -#ifndef BULLET2_GRAPHICCONTROLLER_H -#define BULLET2_GRAPHICCONTROLLER_H +#ifndef __CCDGRAPHICCONTROLLER_H__ +#define __CCDGRAPHICCONTROLLER_H__ #include "PHY_IGraphicController.h" diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index 82acd64161f..33b30758ff0 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -18,8 +18,8 @@ subject to the following restrictions: */ -#ifndef BULLET2_PHYSICSCONTROLLER_H -#define BULLET2_PHYSICSCONTROLLER_H +#ifndef __CCDPHYSICSCONTROLLER_H__ +#define __CCDPHYSICSCONTROLLER_H__ #include <vector> #include <map> @@ -656,4 +656,4 @@ public: }; -#endif //BULLET2_PHYSICSCONTROLLER_H +#endif //__CCDPHYSICSCONTROLLER_H__ diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index 1eed0665564..1315bc732a2 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -18,8 +18,8 @@ subject to the following restrictions: * See also \ref bulletdoc */ -#ifndef CCDPHYSICSENVIRONMENT -#define CCDPHYSICSENVIRONMENT +#ifndef __CCDPHYSICSENVIRONMENT_H__ +#define __CCDPHYSICSENVIRONMENT_H__ #include "PHY_IPhysicsEnvironment.h" #include <vector> @@ -294,4 +294,4 @@ public: #endif }; -#endif //CCDPHYSICSENVIRONMENT +#endif //__CCDPHYSICSENVIRONMENT_H__ diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index d0073d772c8..8e55c4a0c0f 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -29,8 +29,8 @@ * \ingroup physdummy */ -#ifndef _DUMMYPHYSICSENVIRONMENT -#define _DUMMYPHYSICSENVIRONMENT +#ifndef __DUMMYPHYSICSENVIRONMENT_H__ +#define __DUMMYPHYSICSENVIRONMENT_H__ #include "PHY_IPhysicsEnvironment.h" @@ -104,5 +104,5 @@ public: #endif }; -#endif //_DUMMYPHYSICSENVIRONMENT +#endif //__DUMMYPHYSICSENVIRONMENT_H__ diff --git a/source/gameengine/Physics/common/PHY_DynamicTypes.h b/source/gameengine/Physics/common/PHY_DynamicTypes.h index a1761131a8e..a72929d25c5 100644 --- a/source/gameengine/Physics/common/PHY_DynamicTypes.h +++ b/source/gameengine/Physics/common/PHY_DynamicTypes.h @@ -17,8 +17,8 @@ subject to the following restrictions: * \ingroup phys */ -#ifndef __PHY_DYNAMIC_TYPES -#define __PHY_DYNAMIC_TYPES +#ifndef __PHY_DYNAMICTYPES_H__ +#define __PHY_DYNAMICTYPES_H__ @@ -151,4 +151,4 @@ typedef enum PHY_ShapeType { typedef float PHY_Vector3[3]; -#endif //__PHY_DYNAMIC_TYPES +#endif //__PHY_DYNAMICTYPES_H__ diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h index 672f2e5a655..d25af9f898c 100644 --- a/source/gameengine/Physics/common/PHY_IController.h +++ b/source/gameengine/Physics/common/PHY_IController.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef PHY_ICONTROLLER_H -#define PHY_ICONTROLLER_H +#ifndef __PHY_ICONTROLLER_H__ +#define __PHY_ICONTROLLER_H__ #include "PHY_DynamicTypes.h" @@ -62,5 +62,5 @@ public: #endif }; -#endif //PHY_ICONTROLLER_H +#endif //__PHY_ICONTROLLER_H__ diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h index 46f17014090..6a94b3d6ea9 100644 --- a/source/gameengine/Physics/common/PHY_IGraphicController.h +++ b/source/gameengine/Physics/common/PHY_IGraphicController.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef PHY_IGRAPHICCONTROLLER_H -#define PHY_IGRAPHICCONTROLLER_H +#ifndef __PHY_IGRAPHICCONTROLLER_H__ +#define __PHY_IGRAPHICCONTROLLER_H__ #include "PHY_IController.h" @@ -59,5 +59,5 @@ class PHY_IGraphicController : public PHY_IController #endif }; -#endif //PHY_IGRAPHICCONTROLLER_H +#endif //__PHY_IGRAPHICCONTROLLER_H__ diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h index 1ffd3adac9a..77c51ebdb79 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.h +++ b/source/gameengine/Physics/common/PHY_IMotionState.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef PHY__MOTIONSTATE_H -#define PHY__MOTIONSTATE_H +#ifndef __PHY_IMOTIONSTATE_H__ +#define __PHY_IMOTIONSTATE_H__ #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" @@ -67,5 +67,5 @@ public: #endif }; -#endif //PHY__MOTIONSTATE_H +#endif //__PHY_IMOTIONSTATE_H__ diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h index 31a7d71745e..727cbda931d 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef PHY_IPHYSICSCONTROLLER_H -#define PHY_IPHYSICSCONTROLLER_H +#ifndef __PHY_IPHYSICSCONTROLLER_H__ +#define __PHY_IPHYSICSCONTROLLER_H__ #include "PHY_IController.h" @@ -109,5 +109,5 @@ public: #endif }; -#endif //PHY_IPHYSICSCONTROLLER_H +#endif //__PHY_IPHYSICSCONTROLLER_H__ diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index adf6fb03bc1..f64f55b6592 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef _IPHYSICSENVIRONMENT -#define _IPHYSICSENVIRONMENT +#ifndef __PHY_IPHYSICSENVIRONMENT_H__ +#define __PHY_IPHYSICSENVIRONMENT_H__ #include <vector> #include "PHY_DynamicTypes.h" @@ -187,5 +187,5 @@ public: #endif }; -#endif //_IPHYSICSENVIRONMENT +#endif //__PHY_IPHYSICSENVIRONMENT_H__ diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h index da9daa29977..735ce5a8791 100644 --- a/source/gameengine/Physics/common/PHY_IVehicle.h +++ b/source/gameengine/Physics/common/PHY_IVehicle.h @@ -3,8 +3,8 @@ * \ingroup phys */ -#ifndef PHY_IVEHICLE_H -#define PHY_IVEHICLE_H +#ifndef __PHY_IVEHICLE_H__ +#define __PHY_IVEHICLE_H__ //PHY_IVehicle provides a generic interface for (raycast based) vehicles. Mostly targetting 4 wheel cars and 2 wheel motorbikes. @@ -68,4 +68,4 @@ public: #endif }; -#endif //PHY_IVEHICLE_H +#endif //__PHY_IVEHICLE_H__ diff --git a/source/gameengine/Physics/common/PHY_Pro.h b/source/gameengine/Physics/common/PHY_Pro.h index 4189db27c17..110d4731cdc 100644 --- a/source/gameengine/Physics/common/PHY_Pro.h +++ b/source/gameengine/Physics/common/PHY_Pro.h @@ -29,8 +29,8 @@ * \ingroup phys */ -#ifndef PHY_PROPSH -#define PHY_PROPSH +#ifndef __PHY_PRO_H__ +#define __PHY_PRO_H__ #include <MT_Scalar.h> @@ -59,5 +59,5 @@ struct PHY_MaterialProps { bool m_fh_normal; // Should the object slide off slopes? }; -#endif //PHY_PROPSH +#endif //__PHY_PRO_H__ |