summaryrefslogtreecommitdiffstats
path: root/src/Globals.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 01:29:34 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-19 01:29:34 +0200
commit6d5a8892f34f4034b38da467268de9d489e1024e (patch)
tree787fe7d59be7e54a74fcc597eb6e59cf4523ee67 /src/Globals.h
parentInfoDump: Fixed trailing whitespace. (diff)
downloadcuberite-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 'src/Globals.h')
-rw-r--r--src/Globals.h2
1 files changed, 1 insertions, 1 deletions
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