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/Globals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index b84607355..f6c722594 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -239,6 +239,7 @@ template class SizeChecker<UInt16, 2>;
 
 
 // STL stuff:
+#include <thread>
 #include <vector>
 #include <list>
 #include <deque>
@@ -259,7 +260,6 @@ template class SizeChecker<UInt16, 2>;
 	#include "OSSupport/CriticalSection.h"
 	#include "OSSupport/Semaphore.h"
 	#include "OSSupport/Event.h"
-	#include "OSSupport/Thread.h"
 	#include "OSSupport/File.h"
 	#include "Logger.h"
 #else
-- 
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/Globals.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index f6c722594..6e6bb9c92 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -240,6 +240,7 @@ template class SizeChecker<UInt16, 2>;
 
 // STL stuff:
 #include <thread>
+#include <chrono>
 #include <vector>
 #include <list>
 #include <deque>
-- 
cgit v1.2.3


From bde99d684e0bb51adaa053a240abe61cf4af07fb Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Mon, 20 Oct 2014 18:59:40 +0100
Subject: Migrated cSleep and cTimer to std::chrono

---
 src/Globals.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index 6e6bb9c92..b90542af0 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -257,7 +257,6 @@ template class SizeChecker<UInt16, 2>;
 #ifndef TEST_GLOBALS
 	// Common headers (part 1, without macros):
 	#include "StringUtils.h"
-	#include "OSSupport/Sleep.h"
 	#include "OSSupport/CriticalSection.h"
 	#include "OSSupport/Semaphore.h"
 	#include "OSSupport/Event.h"
-- 
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/Globals.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index 8658b49c4..15f5336d8 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -184,7 +184,7 @@ template class SizeChecker<UInt16, 2>;
 #ifdef _WIN32
 	#define WIN32_LEAN_AND_MEAN
 
-	#define _WIN32_WINNT 0x501  // We want to target WinXP and higher
+	#define _WIN32_WINNT_WS03  // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher
 
 	#include <Windows.h>
 	#include <winsock2.h>
@@ -239,7 +239,6 @@ template class SizeChecker<UInt16, 2>;
 
 
 // STL stuff:
-#include <thread>
 #include <chrono>
 #include <vector>
 #include <list>
-- 
cgit v1.2.3


From 187bdab4fa90fbfa5b1979ea529dc9c0deac89d9 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 25 Nov 2014 23:03:33 +0000
Subject: Merge remote-tracking branch 'origin-master' into c++11

---
 src/Globals.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Globals.h')

diff --git a/src/Globals.h b/src/Globals.h
index a64be8d54..fcadc3269 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -184,9 +184,9 @@ template class SizeChecker<UInt16, 2>;
 
 // OS-dependent stuff:
 #ifdef _WIN32
-	#define WIN32_LEAN_AND_MEAN
 
-	#define _WIN32_WINNT_WS03  // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher
+	#define WIN32_LEAN_AND_MEAN
+	#define _WIN32_WINNT _WIN32_WINNT_WS03  // We want to target Windows XP with Service Pack 2 & Windows Server 2003 with Service Pack 1 and higher
 
 	#include <Windows.h>
 	#include <winsock2.h>
-- 
cgit v1.2.3