Fix ODR violation by btSoftSingleRayCallback

Both btSoftMultiBodyDynamicsWorld.cpp and btSoftRigidDynamicsWorld.cpp define a type btSoftSingleRayCallback. Though the types are very similar they are not identical, causing an ODR violation. Move the type definitions into anonymous namespaces so their names no longer collide.
bulletphysics · Mar 21, 2024 · b45d35d · b45d35d
1 parent e88b71b
commit b45d35d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp b/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp
@@ -177,6 +177,7 @@ void btSoftMultiBodyDynamicsWorld::debugDrawWorld()
 	}
 }
 
+namespace {
 struct btSoftSingleRayCallback : public btBroadphaseRayCallback
 {
 	btVector3 m_rayFromWorld;
@@ -250,6 +251,7 @@ struct btSoftSingleRayCallback : public btBroadphaseRayCallback
 		return true;
 	}
 };
+}
 
 void btSoftMultiBodyDynamicsWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
 {

diff --git a/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp b/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
@@ -172,6 +172,7 @@ void btSoftRigidDynamicsWorld::debugDrawWorld()
 	}
 }
 
+namespace {
 struct btSoftSingleRayCallback : public btBroadphaseRayCallback
 {
 	btVector3 m_rayFromWorld;
@@ -245,6 +246,7 @@ struct btSoftSingleRayCallback : public btBroadphaseRayCallback
 		return true;
 	}
 };
+}
 
 void btSoftRigidDynamicsWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback) const
 {