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/log.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/log.h')
-rw-r--r-- | src/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <queue> #include <string> #include <fstream> +#include <thread> #include <mutex> -#include "threads.h" #include "irrlichttypes.h" class ILogOutput; @@ -79,7 +79,7 @@ private: // written to when one thread has access currently). // Works on all known architectures (x86, ARM, MIPS). volatile bool m_silenced_levels[LL_MAX]; - std::map<threadid_t, std::string> m_thread_names; + std::map<std::thread::id, std::string> m_thread_names; mutable std::mutex m_mutex; bool m_trace_enabled; }; |