From 46fd114e9a4e05b74576dce682e24357363298e7 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Mon, 7 Mar 2016 16:55:32 -0500 Subject: Fix race on thread creation This often broke the threading tests on OSX. --- src/threading/thread.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'src/threading/thread.cpp') diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index 8688c4cbf..ecf8563f1 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -116,9 +116,7 @@ bool Thread::start() #if USE_CPP11_THREADS try { - m_thread_obj = new std::thread(threadProc, this); - m_thread_id = m_thread_obj->get_id(); - m_thread_handle = m_thread_obj->native_handle(); + m_thread_obj = new std::thread(threadProc, this); } catch (const std::system_error &e) { return false; } @@ -135,8 +133,6 @@ bool Thread::start() if (status) return false; - m_thread_id = m_thread_handle; - #endif while (!m_running) @@ -234,12 +230,6 @@ bool Thread::getReturnValue(void **ret) } -bool Thread::isCurrentThread() -{ - return thr_is_current_thread(m_thread_id); -} - - #if USE_CPP11_THREADS || USE_POSIX_THREADS void *Thread::threadProc(void *param) #elif defined(_WIN32_WCE) -- cgit v1.2.3