From 0deffb74957c85be40ddcbb3664c2e649d82108b Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 16 Nov 2008 08:06:07 +0000 Subject: [PATCH] mutable wasn't needed for this anonymous union (btBroadphasePair) --- src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h | 2 +- src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h b/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h index db98e28fa..5600da0f5 100644 --- a/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h +++ b/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h @@ -207,7 +207,7 @@ BT_DECLARE_ALIGNED_ALLOCATOR(); btBroadphaseProxy* m_pProxy1; mutable btCollisionAlgorithm* m_algorithm; - mutable union { void* m_internalInfo1; int m_internalTmpValue;};//don't use this data, it will be removed in future version. + union { void* m_internalInfo1; int m_internalTmpValue;};//don't use this data, it will be removed in future version. }; diff --git a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h index 71b9195ce..70969fa9f 100644 --- a/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h +++ b/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h @@ -70,7 +70,7 @@ public: btPersistentManifold(); - btPersistentManifold(void* body0,void* body1,int bla, btScalar contactBreakingThreshold) + btPersistentManifold(void* body0,void* body1,int , btScalar contactBreakingThreshold) : m_body0(body0),m_body1(body1),m_cachedPoints(0), m_contactBreakingThreshold(contactBreakingThreshold) {