1 files changed, 46 insertions, 51 deletions

diff --git a/thirdparty/bullet/LinearMath/btThreads.h b/thirdparty/bullet/LinearMath/btThreads.h
index 921fd088c0..b2227e1724 100644
--- a/thirdparty/bullet/LinearMath/btThreads.h
+++ b/thirdparty/bullet/LinearMath/btThreads.h
@@ -12,14 +12,12 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-
-
 #ifndef BT_THREADS_H
 #define BT_THREADS_H
 
-#include "btScalar.h" // has definitions like SIMD_FORCE_INLINE
+#include "btScalar.h"  // has definitions like SIMD_FORCE_INLINE
 
-#if defined (_MSC_VER) && _MSC_VER >= 1600
+#if defined(_MSC_VER) && _MSC_VER >= 1600
 // give us a compile error if any signatures of overriden methods is changed
 #define BT_OVERRIDE override
 #endif
@@ -36,7 +34,7 @@ const unsigned int BT_MAX_THREAD_COUNT = 64;  // only if BT_THREADSAFE is 1
 bool btIsMainThread();
 bool btThreadsAreRunning();
 unsigned int btGetCurrentThreadIndex();
-void btResetThreadIndexCounter(); // notify that all worker threads have been destroyed
+void btResetThreadIndexCounter();  // notify that all worker threads have been destroyed
 
 ///
 /// btSpinMutex -- lightweight spin-mutex implemented with atomic ops, never puts
@@ -46,19 +44,18 @@ void btResetThreadIndexCounter(); // notify that all worker threads have been de
 ///
 class btSpinMutex
 {
-    int mLock;
+	int mLock;
 
 public:
-    btSpinMutex()
-    {
-        mLock = 0;
-    }
-    void lock();
-    void unlock();
-    bool tryLock();
+	btSpinMutex()
+	{
+		mLock = 0;
+	}
+	void lock();
+	void unlock();
+	bool tryLock();
 };
 
-
 //
 // NOTE: btMutex* is for internal Bullet use only
 //
@@ -70,43 +67,42 @@ public:
 // of bad because if you call any of these functions from external code
 // (where BT_THREADSAFE is undefined) you will get unexpected race conditions.
 //
-SIMD_FORCE_INLINE void btMutexLock( btSpinMutex* mutex )
+SIMD_FORCE_INLINE void btMutexLock(btSpinMutex* mutex)
 {
 #if BT_THREADSAFE
-    mutex->lock();
+	mutex->lock();
 #else
-    (void)mutex;
-#endif // #if BT_THREADSAFE
+	(void)mutex;
+#endif  // #if BT_THREADSAFE
 }
 
-SIMD_FORCE_INLINE void btMutexUnlock( btSpinMutex* mutex )
+SIMD_FORCE_INLINE void btMutexUnlock(btSpinMutex* mutex)
 {
 #if BT_THREADSAFE
-    mutex->unlock();
+	mutex->unlock();
 #else
-    (void)mutex;
-#endif // #if BT_THREADSAFE
+	(void)mutex;
+#endif  // #if BT_THREADSAFE
 }
 
-SIMD_FORCE_INLINE bool btMutexTryLock( btSpinMutex* mutex )
+SIMD_FORCE_INLINE bool btMutexTryLock(btSpinMutex* mutex)
 {
 #if BT_THREADSAFE
-    return mutex->tryLock();
+	return mutex->tryLock();
 #else
-    (void)mutex;
-    return true;
-#endif // #if BT_THREADSAFE
+	(void)mutex;
+	return true;
+#endif  // #if BT_THREADSAFE
 }
 
-
 //
 // btIParallelForBody -- subclass this to express work that can be done in parallel
 //
 class btIParallelForBody
 {
 public:
-    virtual ~btIParallelForBody() {}
-    virtual void forLoop( int iBegin, int iEnd ) const = 0;
+	virtual ~btIParallelForBody() {}
+	virtual void forLoop(int iBegin, int iEnd) const = 0;
 };
 
 //
@@ -116,8 +112,8 @@ public:
 class btIParallelSumBody
 {
 public:
-    virtual ~btIParallelSumBody() {}
-    virtual btScalar sumLoop( int iBegin, int iEnd ) const = 0;
+	virtual ~btIParallelSumBody() {}
+	virtual btScalar sumLoop(int iBegin, int iEnd) const = 0;
 };
 
 //
@@ -127,30 +123,30 @@ public:
 class btITaskScheduler
 {
 public:
-    btITaskScheduler( const char* name );
-    virtual ~btITaskScheduler() {}
-    const char* getName() const { return m_name; }
+	btITaskScheduler(const char* name);
+	virtual ~btITaskScheduler() {}
+	const char* getName() const { return m_name; }
 
-    virtual int getMaxNumThreads() const = 0;
-    virtual int getNumThreads() const = 0;
-    virtual void setNumThreads( int numThreads ) = 0;
-    virtual void parallelFor( int iBegin, int iEnd, int grainSize, const btIParallelForBody& body ) = 0;
-    virtual btScalar parallelSum( int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body ) = 0;
-    virtual void sleepWorkerThreadsHint() {}  // hint the task scheduler that we may not be using these threads for a little while
+	virtual int getMaxNumThreads() const = 0;
+	virtual int getNumThreads() const = 0;
+	virtual void setNumThreads(int numThreads) = 0;
+	virtual void parallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body) = 0;
+	virtual btScalar parallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body) = 0;
+	virtual void sleepWorkerThreadsHint() {}  // hint the task scheduler that we may not be using these threads for a little while
 
-    // internal use only
-    virtual void activate();
-    virtual void deactivate();
+	// internal use only
+	virtual void activate();
+	virtual void deactivate();
 
 protected:
-    const char* m_name;
-    unsigned int m_savedThreadCounter;
-    bool m_isActive;
+	const char* m_name;
+	unsigned int m_savedThreadCounter;
+	bool m_isActive;
 };
 
 // set the task scheduler to use for all calls to btParallelFor()
 // NOTE: you must set this prior to using any of the multi-threaded "Mt" classes
-void btSetTaskScheduler( btITaskScheduler* ts );
+void btSetTaskScheduler(btITaskScheduler* ts);
 
 // get the current task scheduler
 btITaskScheduler* btGetTaskScheduler();
@@ -172,11 +168,10 @@ btITaskScheduler* btGetPPLTaskScheduler();
 
 // btParallelFor -- call this to dispatch work like a for-loop
 //                 (iterations may be done out of order, so no dependencies are allowed)
-void btParallelFor( int iBegin, int iEnd, int grainSize, const btIParallelForBody& body );
+void btParallelFor(int iBegin, int iEnd, int grainSize, const btIParallelForBody& body);
 
 // btParallelSum -- call this to dispatch work like a for-loop, returns the sum of all iterations
 //                 (iterations may be done out of order, so no dependencies are allowed)
-btScalar btParallelSum( int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body );
-
+btScalar btParallelSum(int iBegin, int iEnd, int grainSize, const btIParallelSumBody& body);
 
 #endif