Changeset 8073 for code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision

Timestamp:

Mar 14, 2011, 4:08:06 AM (14 years ago)

Author:

rgrieder

Message:

Merged mac_osx branch (after renaming it from ois_update) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp (modified) (1 diff)

code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp

@@ -38 +38 @@
 int gNumGjkChecks = 0;
 
-#ifdef check
-struct CompilerError
-{
-    void CompilerError() {}
-};
-#endif
 
 btGjkPairDetector::btGjkPairDetector(const btConvexShape* objectA,const btConvexShape* objectB,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver*  penetrationDepthSolver)