From c1b5024aea9f975aa604246bdd755d9933b16f29 Mon Sep 17 00:00:00 2001 From: Alexis Breust Date: Thu, 25 Jan 2018 16:37:30 +0100 Subject: [PATCH 1/2] Removed warnings of unused variable in btThreads header --- src/LinearMath/btThreads.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/LinearMath/btThreads.h b/src/LinearMath/btThreads.h index 05fd15ec8..cef542329 100644 --- a/src/LinearMath/btThreads.h +++ b/src/LinearMath/btThreads.h @@ -72,6 +72,8 @@ SIMD_FORCE_INLINE void btMutexLock( btSpinMutex* mutex ) { #if BT_THREADSAFE mutex->lock(); +#else + (void)mutex; #endif // #if BT_THREADSAFE } @@ -79,6 +81,8 @@ SIMD_FORCE_INLINE void btMutexUnlock( btSpinMutex* mutex ) { #if BT_THREADSAFE mutex->unlock(); +#else + (void)mutex; #endif // #if BT_THREADSAFE } @@ -87,6 +91,7 @@ SIMD_FORCE_INLINE bool btMutexTryLock( btSpinMutex* mutex ) #if BT_THREADSAFE return mutex->tryLock(); #else + (void)mutex; return true; #endif // #if BT_THREADSAFE } From d3f7a685410a906a5d3a72e1e9e51cdadf6f9ce6 Mon Sep 17 00:00:00 2001 From: Alexis Breust Date: Thu, 25 Jan 2018 16:41:25 +0100 Subject: [PATCH 2/2] Removed warning in btCapsuleShape header --- src/BulletCollision/CollisionShapes/btCapsuleShape.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/src/BulletCollision/CollisionShapes/btCapsuleShape.h index 7d64b46ab..5a3362834 100644 --- a/src/BulletCollision/CollisionShapes/btCapsuleShape.h +++ b/src/BulletCollision/CollisionShapes/btCapsuleShape.h @@ -49,6 +49,7 @@ public: virtual void setMargin(btScalar collisionMargin) { //don't override the margin for capsules, their entire radius == margin + (void)collisionMargin; } virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const