summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 16:55:57 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-22 16:55:57 +0100
commita7a4b2886d98eb0c015421fb82c60531a8e66aaa (patch)
treee17e88a4a45b0d6b9fbed7af6998f95de73b73ff
parentfixed rdynamic as its not acctually needed a cmake handles it, looks like the problem was caused by the linux linker accepting the option twice and the os x linker not (diff)
downloadcuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar.gz
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar.bz2
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar.lz
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar.xz
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.tar.zst
cuberite-a7a4b2886d98eb0c015421fb82c60531a8e66aaa.zip
-rw-r--r--src/WorldStorage/WorldStorage.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h
index 106842a22..007d37571 100644
--- a/src/WorldStorage/WorldStorage.h
+++ b/src/WorldStorage/WorldStorage.h
@@ -16,7 +16,6 @@
#include "../ChunkDef.h"
#include "../OSSupport/IsThread.h"
-#include "../OSSupport/Queue.h"
@@ -94,7 +93,7 @@ protected:
sChunkLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ, bool a_Generate) : m_ChunkX(a_ChunkX), m_ChunkY(a_ChunkY), m_ChunkZ(a_ChunkZ), m_Generate(a_Generate) {}
} ;
- typedef cQueue<sChunkLoad> sChunkLoadQueue;
+ typedef std::list<sChunkLoad> sChunkLoadQueue;
cWorld * m_World;
AString m_StorageSchemaName;