Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1431 from kwasimensah/master

Browse Source 
Fix MACROS for when BT_THREADSAFE is defined
This commit is contained in:
erwincoumans
2017-11-15 17:57:22 -08:00
committed by GitHub
parent b2dda14948 2f58cf0d00
commit 6214ce5f93
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/LinearMath/btQuickprof.cpp
View File

@@ -708,7 +708,8 @@ unsigned int btQuickprofGetCurrentThreadIndex2() {
#if BT_THREADSAFE #if BT_THREADSAFE
return btGetCurrentThreadIndex(); return btGetCurrentThreadIndex();
#elif defined(BT_HAVE_TLS) #else
#if defined(BT_HAVE_TLS)
static __thread unsigned int sThreadIndex = kNullIndex; static __thread unsigned int sThreadIndex = kNullIndex;
#elif defined(_WIN32) #elif defined(_WIN32)
__declspec(thread) static unsigned int sThreadIndex = kNullIndex; __declspec(thread) static unsigned int sThreadIndex = kNullIndex;
@@ -723,6 +724,7 @@ unsigned int btQuickprofGetCurrentThreadIndex2() {
sThreadIndex = gThreadCounter++; sThreadIndex = gThreadCounter++;
} }
return sThreadIndex; return sThreadIndex;
#endif //BT_THREADSAFE
} }
void btEnterProfileZoneDefault(const char* name) void btEnterProfileZoneDefault(const char* name)