diff options
author | Tycho <work.tycho+git@gmail.com> | 2014-06-14 19:19:34 +0200 |
---|---|---|
committer | Tycho <work.tycho+git@gmail.com> | 2014-06-14 19:19:34 +0200 |
commit | a2df68b80b3ccb4395922c4351d4bd2f366003db (patch) | |
tree | b54f6fac25105ad1810fe5aa46a85608530a4405 | |
parent | fixed const issue (diff) | |
download | cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar.gz cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar.bz2 cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar.lz cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar.xz cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.tar.zst cuberite-a2df68b80b3ccb4395922c4351d4bd2f366003db.zip |
-rw-r--r-- | src/AllocationPool.h | 2 | ||||
-rw-r--r-- | tests/ChunkData/CopyBlocks.cpp | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/AllocationPool.h b/src/AllocationPool.h index e4f1427f6..f73b32601 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(int i = 0; i < NumElementsInReserve; i++) + for(size_t i = 0; i < NumElementsInReserve; i++) { void * space = malloc(sizeof(T)); if (space == NULL) diff --git a/tests/ChunkData/CopyBlocks.cpp b/tests/ChunkData/CopyBlocks.cpp index be8cab234..7f8f66c4d 100644 --- a/tests/ChunkData/CopyBlocks.cpp +++ b/tests/ChunkData/CopyBlocks.cpp @@ -17,7 +17,15 @@ int main(int argc, char ** argv) { // Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02: - cChunkData Data; + class 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())); + cChunkData Data(Pool); cChunkDef::BlockTypes BlockTypes; cChunkDef::BlockNibbles BlockMetas; memset(BlockTypes, 0x01, sizeof(BlockTypes)); |