Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add the BT_ prefix for all #ifdef guards, to avoid conflicts with developers own header defines.

Browse Source 
Fixes Issue 497

//license header
#ifndef BT_RIGIDBODY_H
#define BT_RIGIDBODY_H
class btRigidBody
{
};
#endif //BT_RIGIDBODY_H
This commit is contained in:
erwin.coumans
2011-04-01 17:14:52 +00:00
parent b1f21a7e6a
commit 852fa3ba30
139 changed files with 460 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
View File

@@ -13,8 +13,8 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
#define SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
#ifndef BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
#define BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
@@ -150,4 +150,4 @@ public:
};
#endif //SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H
#endif //BT_SOFT_BODY_CONCAVE_COLLISION_ALGORITHM_H

6
src/BulletSoftBody/btSoftBodyHelpers.h
View File

@@ -13,8 +13,8 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SOFT_BODY_HELPERS_H
#define SOFT_BODY_HELPERS_H
#ifndef BT_SOFT_BODY_HELPERS_H
#define BT_SOFT_BODY_HELPERS_H
#include "btSoftBody.h"
@@ -140,4 +140,4 @@ struct btSoftBodyHelpers
};
#endif //SOFT_BODY_HELPERS_H
#endif //BT_SOFT_BODY_HELPERS_H

6
src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
View File

@@ -13,8 +13,8 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SOFT_RIGID_COLLISION_ALGORITHM_H
#define SOFT_RIGID_COLLISION_ALGORITHM_H
#ifndef BT_SOFT_RIGID_COLLISION_ALGORITHM_H
#define BT_SOFT_RIGID_COLLISION_ALGORITHM_H
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -70,6 +70,6 @@ public:
};
#endif //SOFT_RIGID_COLLISION_ALGORITHM_H
#endif //BT_SOFT_RIGID_COLLISION_ALGORITHM_H

6
src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
View File

@@ -13,8 +13,8 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SOFT_SOFT_COLLISION_ALGORITHM_H
#define SOFT_SOFT_COLLISION_ALGORITHM_H
#ifndef BT_SOFT_SOFT_COLLISION_ALGORITHM_H
#define BT_SOFT_SOFT_COLLISION_ALGORITHM_H
#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h"
#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
@@ -64,6 +64,6 @@ public:
};
#endif //SOFT_SOFT_COLLISION_ALGORITHM_H
#endif //BT_SOFT_SOFT_COLLISION_ALGORITHM_H

6
src/BulletSoftBody/btSparseSDF.h
View File

@@ -14,8 +14,8 @@ subject to the following restrictions:
*/
///btSparseSdf implementation by Nathanael Presson
#ifndef _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
#define _14F9D17F_EAE8_4aba_B41C_292DB2AA70F3_
#ifndef BT_SPARSE_SDF_H
#define BT_SPARSE_SDF_H
#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h"
@@ -303,4 +303,4 @@ struct btSparseSdf
};
#endif
#endif //BT_SPARSE_SDF_H