diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-06-14 19:43:36 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-06-14 19:43:36 +0200 |
commit | 0310a50192fcbd4a9e5ec03c98a0d7f33457df54 (patch) | |
tree | 2eadcb6d26691e98215391330b4c23c3ce3f798a | |
parent | fixed compile (diff) | |
download | cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar.gz cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar.bz2 cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar.lz cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar.xz cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.tar.zst cuberite-0310a50192fcbd4a9e5ec03c98a0d7f33457df54.zip |
Diffstat (limited to '')
-rw-r--r-- | src/AllocationPool.h | 2 | ||||
-rw-r--r-- | src/ChunkMap.cpp | 2 | ||||
-rw-r--r-- | src/ChunkMap.h | 8 | ||||
-rw-r--r-- | tests/ChunkData/ArraytoCoord.cpp | 4 | ||||
-rw-r--r-- | tests/ChunkData/Coordinates.cpp | 4 | ||||
-rw-r--r-- | tests/ChunkData/Copies.cpp | 4 | ||||
-rw-r--r-- | tests/ChunkData/CopyBlocks.cpp | 4 | ||||
-rw-r--r-- | tests/ChunkData/creatable.cpp | 4 |
8 files changed, 16 insertions, 16 deletions
diff --git a/src/AllocationPool.h b/src/AllocationPool.h index f73b32601..9144c2eac 100644 --- a/src/AllocationPool.h +++ b/src/AllocationPool.h @@ -19,7 +19,7 @@ class cAllocationPool { cAllocationPool(std::auto_ptr<cStarvationCallbacks> a_Callbacks) : m_Callbacks(a_Callbacks) { - for(size_t i = 0; i < NumElementsInReserve; i++) + for (size_t i = 0; i < NumElementsInReserve; i++) { void * space = malloc(sizeof(T)); if (space == NULL) diff --git a/src/ChunkMap.cpp b/src/ChunkMap.cpp index 586d7a65e..862d0b7ec 100644 --- a/src/ChunkMap.cpp +++ b/src/ChunkMap.cpp @@ -35,7 +35,7 @@ cChunkMap::cChunkMap(cWorld * a_World ) : m_World( a_World ), - m_Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())) + m_Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())) { } diff --git a/src/ChunkMap.h b/src/ChunkMap.h index efe489854..071921f92 100644 --- a/src/ChunkMap.h +++ b/src/ChunkMap.h @@ -352,7 +352,7 @@ private: { public: cChunkLayer(int a_LayerX, int a_LayerZ, cChunkMap * a_Parent, - cAllocationPool<cChunkData::sChunkSection,1600>& a_Pool); + cAllocationPool<cChunkData::sChunkSection, 1600>& a_Pool); ~cChunkLayer(); /** Always returns an assigned chunkptr, but the chunk needn't be valid (loaded / generated) - callers must check */ @@ -397,11 +397,11 @@ private: cChunkMap * m_Parent; int m_NumChunksLoaded; - cAllocationPool<cChunkData::sChunkSection,1600> & m_Pool; + cAllocationPool<cChunkData::sChunkSection, 1600> & m_Pool; }; class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() { @@ -447,7 +447,7 @@ private: /** The cChunkStay descendants that are currently enabled in this chunkmap */ cChunkStays m_ChunkStays; - cAllocationPool<cChunkData::sChunkSection,1600> m_Pool; + cAllocationPool<cChunkData::sChunkSection, 1600> m_Pool; cChunkPtr GetChunk (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading / generating if not valid cChunkPtr GetChunkNoGen (int a_ChunkX, int a_ChunkY, int a_ChunkZ); // Also queues the chunk for loading if not valid; doesn't generate diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp index 80bcc5283..3f22d239a 100644 --- a/tests/ChunkData/ArraytoCoord.cpp +++ b/tests/ChunkData/ArraytoCoord.cpp @@ -7,13 +7,13 @@ int main(int argc, char** argv) { class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() {} virtual void OnStopUsingBuffer() {} virtual void OnBufferEmpty() {} }; - cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())); + cAllocationPool<cChunkData::sChunkSection, 1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())); { // Test first segment diff --git a/tests/ChunkData/Coordinates.cpp b/tests/ChunkData/Coordinates.cpp index d5abbb143..66fab46ab 100644 --- a/tests/ChunkData/Coordinates.cpp +++ b/tests/ChunkData/Coordinates.cpp @@ -7,13 +7,13 @@ int main(int argc, char** argv) { class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() {} virtual void OnStopUsingBuffer() {} virtual void OnBufferEmpty() {} }; - cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())); + cAllocationPool<cChunkData::sChunkSection, 1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())); { cChunkData buffer(Pool); diff --git a/tests/ChunkData/Copies.cpp b/tests/ChunkData/Copies.cpp index 6f5d40792..4a672380f 100644 --- a/tests/ChunkData/Copies.cpp +++ b/tests/ChunkData/Copies.cpp @@ -7,13 +7,13 @@ int main(int argc, char** argv) { class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() {} virtual void OnStopUsingBuffer() {} virtual void OnBufferEmpty() {} }; - cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())); + cAllocationPool<cChunkData::sChunkSection, 1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())); { cChunkData buffer(Pool); diff --git a/tests/ChunkData/CopyBlocks.cpp b/tests/ChunkData/CopyBlocks.cpp index 7f8f66c4d..db3d391c3 100644 --- a/tests/ChunkData/CopyBlocks.cpp +++ b/tests/ChunkData/CopyBlocks.cpp @@ -18,13 +18,13 @@ int main(int argc, char ** argv) { // Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02: class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() {} virtual void OnStopUsingBuffer() {} virtual void OnBufferEmpty() {} }; - cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())); + cAllocationPool<cChunkData::sChunkSection, 1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())); cChunkData Data(Pool); cChunkDef::BlockTypes BlockTypes; cChunkDef::BlockNibbles BlockMetas; diff --git a/tests/ChunkData/creatable.cpp b/tests/ChunkData/creatable.cpp index 0dde8cf3b..2bb61b7ce 100644 --- a/tests/ChunkData/creatable.cpp +++ b/tests/ChunkData/creatable.cpp @@ -5,13 +5,13 @@ int main(int argc, char** argv) { class cStarvationCallbacks - : public cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks + : public cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks { virtual void OnStartingUsingBuffer() {} virtual void OnStopUsingBuffer() {} virtual void OnBufferEmpty() {} }; - cAllocationPool<cChunkData::sChunkSection,1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection,1600>::cStarvationCallbacks>(new cStarvationCallbacks())); + cAllocationPool<cChunkData::sChunkSection, 1600> Pool(std::auto_ptr<cAllocationPool<cChunkData::sChunkSection, 1600>::cStarvationCallbacks>(new cStarvationCallbacks())); cChunkData buffer(Pool); return 0; } |