diff options
| author | Mattes D <github@xoft.cz> | 2014-12-07 15:01:36 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-12-07 15:01:36 +0100 |
| commit | d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21 (patch) | |
| tree | b0dbd8a8396ad22cf77cb4b367295d25ad3055a7 /src/Root.h | |
| parent | Reduced river height (diff) | |
| parent | Merge remote-tracking branch 'origin/master' into c++11 (diff) | |
| download | cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.gz cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.bz2 cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.lz cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.xz cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.tar.zst cuberite-d00ebd7ee700fcd7f30ea27d238ba1f0d56dfe21.zip | |
Diffstat (limited to 'src/Root.h')
| -rw-r--r-- | src/Root.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Root.h b/src/Root.h index 29753a47d..e70b284f9 100644 --- a/src/Root.h +++ b/src/Root.h @@ -6,6 +6,7 @@ #include "HTTPServer/HTTPServer.h" #include "Defines.h" #include "RankManager.h" +#include <thread> @@ -177,7 +178,7 @@ private: cCriticalSection m_CSPendingCommands; cCommandQueue m_PendingCommands; - cThread * m_InputThread; + std::thread m_InputThread; cServer * m_Server; cMonsterConfig * m_MonsterConfig; @@ -212,10 +213,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 |