Merge pull request #1527 from Breush/btthreads-header-warnings-removal

Removed warnings of unused variable in btThreads header
This commit is contained in:
erwincoumans
2018-01-25 08:53:17 -08:00
committed by GitHub
2 changed files with 6 additions and 0 deletions

View File

@@ -49,6 +49,7 @@ public:
virtual void setMargin(btScalar collisionMargin) virtual void setMargin(btScalar collisionMargin)
{ {
//don't override the margin for capsules, their entire radius == margin //don't override the margin for capsules, their entire radius == margin
(void)collisionMargin;
} }
virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const virtual void getAabb (const btTransform& t, btVector3& aabbMin, btVector3& aabbMax) const

View File

@@ -72,6 +72,8 @@ SIMD_FORCE_INLINE void btMutexLock( btSpinMutex* mutex )
{ {
#if BT_THREADSAFE #if BT_THREADSAFE
mutex->lock(); mutex->lock();
#else
(void)mutex;
#endif // #if BT_THREADSAFE #endif // #if BT_THREADSAFE
} }
@@ -79,6 +81,8 @@ SIMD_FORCE_INLINE void btMutexUnlock( btSpinMutex* mutex )
{ {
#if BT_THREADSAFE #if BT_THREADSAFE
mutex->unlock(); mutex->unlock();
#else
(void)mutex;
#endif // #if BT_THREADSAFE #endif // #if BT_THREADSAFE
} }
@@ -87,6 +91,7 @@ SIMD_FORCE_INLINE bool btMutexTryLock( btSpinMutex* mutex )
#if BT_THREADSAFE #if BT_THREADSAFE
return mutex->tryLock(); return mutex->tryLock();
#else #else
(void)mutex;
return true; return true;
#endif // #if BT_THREADSAFE #endif // #if BT_THREADSAFE
} }