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 /src | |
| 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 'src')
| -rw-r--r-- | src/AllocationPool.h | 2 | ||||
| -rw-r--r-- | src/ChunkMap.cpp | 2 | ||||
| -rw-r--r-- | src/ChunkMap.h | 8 |
3 files changed, 6 insertions, 6 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 |