mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

whoops, the last commit broke compilation on Linux

metadata
Wenzel Jakob 2012-10-01 01:00:50 -04:00
parent b83596accd
commit 9dabb85b67
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libcore/thread.cpp
View File

@ -411,9 +411,9 @@ int mts_omp_get_thread_num() {
void Thread::staticInitialization() { void Thread::staticInitialization() {
#if defined(__OSX__) #if defined(__OSX__)
__mts_autorelease_init(); __mts_autorelease_init();
#endif
#if defined(MTS_OPENMP) #if defined(MTS_OPENMP)
__omp_threadCount = omp_get_max_threads(); __omp_threadCount = omp_get_max_threads();
#endif
#endif #endif
detail::initializeGlobalTLS(); detail::initializeGlobalTLS();
detail::initializeLocalTLS(); detail::initializeLocalTLS();
@ -473,7 +473,9 @@ void Thread::initializeOpenMP(size_t threadCount) {
#pragma omp parallel #pragma omp parallel
{ {
#if defined(__OSX__)
pthread_setspecific(__omp_key, reinterpret_cast<void *>(counter)); pthread_setspecific(__omp_key, reinterpret_cast<void *>(counter));
#endif
detail::initializeLocalTLS(); detail::initializeLocalTLS();
Thread *thread = Thread::getThread(); Thread *thread = Thread::getThread();
if (!thread) { if (!thread) {