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/threads.h | |
parent | 5cc8ad946efb3612eb6ea8655780b29fe4c62e19 (diff) | |
download | minetest-6c5e5e202394ce8063e3c2d9b663145bc4f8efce.tar.gz minetest-6c5e5e202394ce8063e3c2d9b663145bc4f8efce.tar.bz2 minetest-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 'src/threads.h')
-rw-r--r-- | src/threads.h | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/threads.h b/src/threads.h deleted file mode 100644 index ea84abd3e..000000000 --- a/src/threads.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Minetest -Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com> -Copyright (C) 2017 nerzhul, Loic Blot <loic.blot@unix-experience.fr> - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#pragma once - -/////////////// -#include <thread> - -// -// threadid_t, threadhandle_t -// -typedef std::thread::id threadid_t; -typedef std::thread::native_handle_type threadhandle_t; - -// -// ThreadStartFunc -// -typedef void *ThreadStartFunc(void *param); - - -inline threadid_t thr_get_current_thread_id() -{ - return std::this_thread::get_id(); -} - -inline bool thr_compare_thread_id(threadid_t thr1, threadid_t thr2) -{ - return thr1 == thr2; -} - -inline bool thr_is_current_thread(threadid_t thr) -{ - return thr_compare_thread_id(thr_get_current_thread_id(), thr); -} |