From fdede6003446efe2002fc650f635f1be73265116 Mon Sep 17 00:00:00 2001 From: kwolekr Date: Sat, 31 Oct 2015 02:38:23 -0400 Subject: Fix C++11 compatibility --- src/threading/thread.cpp | 6 +++--- src/threading/thread.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/threading') diff --git a/src/threading/thread.cpp b/src/threading/thread.cpp index 0996a9e34..57b551503 100644 --- a/src/threading/thread.cpp +++ b/src/threading/thread.cpp @@ -117,9 +117,9 @@ bool Thread::start() try { m_thread_obj = new std::thread(threadProc, this); - m_thread_id = m_thread->get_id(); - m_thread_handle = m_thread->native_handle(); - } except (const std::system_error &e) { + m_thread_id = m_thread_obj->get_id(); + m_thread_handle = m_thread_obj->native_handle(); + } catch (const std::system_error &e) { return false; } diff --git a/src/threading/thread.h b/src/threading/thread.h index 83ca785c7..5f2d8aad1 100644 --- a/src/threading/thread.h +++ b/src/threading/thread.h @@ -26,6 +26,7 @@ DEALINGS IN THE SOFTWARE. #ifndef THREADING_THREAD_H #define THREADING_THREAD_H +#include "basicmacros.h" #include "threading/atomic.h" #include "threading/mutex.h" #include "threads.h" -- cgit v1.2.3