diff options
author | ShadowNinja <ShadowNinja@users.noreply.github.com> | 2017-06-11 03:43:05 -0400 |
---|---|---|
committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-11 09:43:05 +0200 |
commit | 6c5e5e202394ce8063e3c2d9b663145bc4f8efce (patch) | |
tree | 2916ed7f7fc19c934fe5f614a9eeb1a282f13081 /src/script/cpp_api/s_base.h | |
parent | 5cc8ad946efb3612eb6ea8655780b29fe4c62e19 (diff) | |
download | hax-minetest-server-6c5e5e202394ce8063e3c2d9b663145bc4f8efce.tar.gz hax-minetest-server-6c5e5e202394ce8063e3c2d9b663145bc4f8efce.zip |
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.
Diffstat (limited to '')
-rw-r--r-- | src/script/cpp_api/s_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 <iostream> #include <string> +#include <thread> #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: |