diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-19 01:29:34 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-19 01:29:34 +0200 |
commit | 6d5a8892f34f4034b38da467268de9d489e1024e (patch) | |
tree | 787fe7d59be7e54a74fcc597eb6e59cf4523ee67 /src/Root.h | |
parent | InfoDump: Fixed trailing whitespace. (diff) | |
download | cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar.gz cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar.bz2 cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar.lz cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar.xz cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.tar.zst cuberite-6d5a8892f34f4034b38da467268de9d489e1024e.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Root.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Root.h b/src/Root.h index 84c6a98ec..7c7798315 100644 --- a/src/Root.h +++ b/src/Root.h @@ -174,7 +174,7 @@ private: cCriticalSection m_CSPendingCommands; cCommandQueue m_PendingCommands; - cThread * m_InputThread; + std::thread m_InputThread; cServer * m_Server; cMonsterConfig * m_MonsterConfig; @@ -207,10 +207,10 @@ private: /// Does the actual work of executing a command void DoExecuteConsoleCommand(const AString & a_Cmd); - - static void InputThread(void* a_Params); static cRoot* s_Root; + + static void InputThread(cRoot * a_Params); }; // tolua_export |