From 6c5e5e202394ce8063e3c2d9b663145bc4f8efce Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Sun, 11 Jun 2017 03:43:05 -0400 Subject: Remove threads.h and replace its definitions with their C++11 equivalents (#5957) This also changes threadProc's signature, since C++11 supports arbitrary thread function signatures. --- src/script/cpp_api/s_base.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/script/cpp_api/s_base.h') diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h index eda4e73ac..ed056db31 100644 --- a/src/script/cpp_api/s_base.h +++ b/src/script/cpp_api/s_base.h @@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include #include "util/basic_macros.h" extern "C" { @@ -29,7 +30,6 @@ extern "C" { } #include "irrlichttypes.h" -#include "threads.h" #include "threading/mutex_auto_lock.h" #include "common/c_types.h" #include "common/c_internal.h" @@ -122,7 +122,7 @@ protected: bool m_secure; #ifdef SCRIPTAPI_LOCK_DEBUG int m_lock_recursion_count; - threadid_t m_owning_thread; + std::thread::id m_owning_thread; #endif private: -- cgit v1.2.3