diff --git a/src/BulletMultiThreaded/SequentialThreadSupport.cpp b/src/BulletMultiThreaded/SequentialThreadSupport.cpp index 8cc72418f..199927721 100644 --- a/src/BulletMultiThreaded/SequentialThreadSupport.cpp +++ b/src/BulletMultiThreaded/SequentialThreadSupport.cpp @@ -165,5 +165,17 @@ btCriticalSection* SequentialThreadSupport::createCriticalSection() } +void SequentialThreadSupport::deleteBarrier(btBarrier* barrier) +{ + delete barrier; +} + +void SequentialThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection) +{ + delete criticalSection; +} + + + diff --git a/src/BulletMultiThreaded/SequentialThreadSupport.h b/src/BulletMultiThreaded/SequentialThreadSupport.h index 2b9ade82a..a188ef219 100644 --- a/src/BulletMultiThreaded/SequentialThreadSupport.h +++ b/src/BulletMultiThreaded/SequentialThreadSupport.h @@ -89,6 +89,10 @@ public: virtual btCriticalSection* createCriticalSection(); + virtual void deleteBarrier(btBarrier* barrier); + + virtual void deleteCriticalSection(btCriticalSection* criticalSection); + }; diff --git a/src/BulletMultiThreaded/btThreadSupportInterface.h b/src/BulletMultiThreaded/btThreadSupportInterface.h index bbe7264bd..54f1769cf 100644 --- a/src/BulletMultiThreaded/btThreadSupportInterface.h +++ b/src/BulletMultiThreaded/btThreadSupportInterface.h @@ -79,7 +79,7 @@ public: virtual void deleteBarrier(btBarrier* barrier)=0; - virtual void deleteCriticalSection(btCriticalSection* criticalSection)=0; + virtual void deleteCriticalSection(btCriticalSection* criticalSection)=0; virtual void* getThreadLocalMemory(int taskId) { return 0; } diff --git a/src/MiniCL/MiniCL.cpp b/src/MiniCL/MiniCL.cpp index 52148dde0..ba0865aa7 100644 --- a/src/MiniCL/MiniCL.cpp +++ b/src/MiniCL/MiniCL.cpp @@ -32,6 +32,7 @@ subject to the following restrictions: #include "MiniCLTask/MiniCLTask.h" #include "LinearMath/btMinMax.h" #include +#include //#define DEBUG_MINICL_KERNELS 1 @@ -478,7 +479,7 @@ static void* localBufMalloc(int size) if((sLocalBufUsed + size16) > LOCAL_BUF_SIZE) { // reset spLocalBufCurr = sLocalMemBuf; - while((unsigned long)spLocalBufCurr & 0x0F) spLocalBufCurr++; // align to 16 bytes + while((size_t)spLocalBufCurr & 0x0F) spLocalBufCurr++; // align to 16 bytes sLocalBufUsed = 0; } void* ret = spLocalBufCurr;