From 6d5a8892f34f4034b38da467268de9d489e1024e Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 19 Oct 2014 00:29:34 +0100
Subject: Use std::thread

---
 src/Root.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/Root.h')

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
 
 
-- 
cgit v1.2.3


From aa19a3afb0b94e8b5fe055eeb38b1fb2ee1a67b0 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sun, 19 Oct 2014 14:10:18 +0100
Subject: Migrated random generators to std::random

---
 src/Root.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Root.h')

diff --git a/src/Root.h b/src/Root.h
index 85800a4a8..c6bea4902 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -210,7 +210,7 @@ private:
 	
 	static cRoot* s_Root;
 
-	static void InputThread(cRoot * a_Params);
+	static void InputThread(cRoot & a_Params);
 };  // tolua_export
 
 
-- 
cgit v1.2.3


From 51fa6b4090ee930d03592550613592b1087fb788 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Thu, 23 Oct 2014 23:58:01 +0100
Subject: Suggestions

---
 src/Root.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Root.h')

diff --git a/src/Root.h b/src/Root.h
index c6bea4902..2860c1ce2 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>
 
 
 
-- 
cgit v1.2.3