fix MinGW compilation, use size_t instead of unsigned long

add missing virtual methods in SequentialThreadSupport
This commit is contained in:
erwin.coumans
2012-09-09 22:19:54 +00:00
parent e2522c6f9b
commit f50cf5585a
4 changed files with 19 additions and 2 deletions

View File

@@ -165,5 +165,17 @@ btCriticalSection* SequentialThreadSupport::createCriticalSection()
}
void SequentialThreadSupport::deleteBarrier(btBarrier* barrier)
{
delete barrier;
}
void SequentialThreadSupport::deleteCriticalSection(btCriticalSection* criticalSection)
{
delete criticalSection;
}

View File

@@ -89,6 +89,10 @@ public:
virtual btCriticalSection* createCriticalSection();
virtual void deleteBarrier(btBarrier* barrier);
virtual void deleteCriticalSection(btCriticalSection* criticalSection);
};

View File

@@ -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; }

View File

@@ -32,6 +32,7 @@ subject to the following restrictions:
#include "MiniCLTask/MiniCLTask.h"
#include "LinearMath/btMinMax.h"
#include <stdio.h>
#include <stddef.h>
//#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;