avoid conflicts when using a unity build (single cpp file including many other cpp)

2019-01-23 13:35:58 -08:00
parent 0cf3f7d750
commit 93087f36df
3 changed files with 10 additions and 10 deletions
--- a/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
+++ b/src/BulletCollision/CollisionShapes/btConvexPolyhedron.cpp
@@ -27,7 +27,7 @@ btConvexPolyhedron::~btConvexPolyhedron()
 {
 }

-inline bool IsAlmostZero(const btVector3& v)
+inline bool IsAlmostZero1(const btVector3& v)
 {
 	if (btFabs(v.x()) > 1e-6 || btFabs(v.y()) > 1e-6 || btFabs(v.z()) > 1e-6) return false;
 	return true;
@@ -123,7 +123,7 @@ void btConvexPolyhedron::initialize()
 			for (int p = 0; p < m_uniqueEdges.size(); p++)
 			{
 				if (IsAlmostZero(m_uniqueEdges[p] - edge) ||
-					IsAlmostZero(m_uniqueEdges[p] + edge))
+					IsAlmostZero1(m_uniqueEdges[p] + edge))
 				{
 					found = true;
 					break;