diff options
author | peterbell10 <peterbell10@live.co.uk> | 2018-07-23 20:12:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-23 20:12:51 +0200 |
commit | 31a11a6df4922b590a50a5ff3d3c00d42a45599d (patch) | |
tree | e495de40981de4fd89bf4b652a13fe1dcec723d7 /tests/ChunkData | |
parent | cPawn: Reset last ground height in ResetPosition (#4261) (diff) | |
download | cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar.gz cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar.bz2 cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar.lz cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar.xz cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.tar.zst cuberite-31a11a6df4922b590a50a5ff3d3c00d42a45599d.zip |
Diffstat (limited to 'tests/ChunkData')
-rw-r--r-- | tests/ChunkData/ArraytoCoord.cpp | 9 | ||||
-rw-r--r-- | tests/ChunkData/Coordinates.cpp | 9 | ||||
-rw-r--r-- | tests/ChunkData/Copies.cpp | 9 | ||||
-rw-r--r-- | tests/ChunkData/CopyBlocks.cpp | 13 | ||||
-rw-r--r-- | tests/ChunkData/creatable.cpp | 13 |
5 files changed, 39 insertions, 14 deletions
diff --git a/tests/ChunkData/ArraytoCoord.cpp b/tests/ChunkData/ArraytoCoord.cpp index 1591bc9a7..440730e46 100644 --- a/tests/ChunkData/ArraytoCoord.cpp +++ b/tests/ChunkData/ArraytoCoord.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override + { + return false; + } } Pool; { diff --git a/tests/ChunkData/Coordinates.cpp b/tests/ChunkData/Coordinates.cpp index 31aa1179e..304df191f 100644 --- a/tests/ChunkData/Coordinates.cpp +++ b/tests/ChunkData/Coordinates.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override + { + return false; + } } Pool; { cChunkData buffer(Pool); diff --git a/tests/ChunkData/Copies.cpp b/tests/ChunkData/Copies.cpp index b4d9c3721..7fc027ece 100644 --- a/tests/ChunkData/Copies.cpp +++ b/tests/ChunkData/Copies.cpp @@ -11,15 +11,20 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> { - virtual cChunkData::sChunkSection * Allocate() + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - virtual void Free(cChunkData::sChunkSection * a_Ptr) + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection>&) const NOEXCEPT override + { + return false; + } } Pool; { cChunkData buffer(Pool); diff --git a/tests/ChunkData/CopyBlocks.cpp b/tests/ChunkData/CopyBlocks.cpp index 8253ac2ec..623ed208b 100644 --- a/tests/ChunkData/CopyBlocks.cpp +++ b/tests/ChunkData/CopyBlocks.cpp @@ -21,16 +21,21 @@ int main(int argc, char ** argv) // Set up a cChunkData with known contents - all blocks 0x01, all metas 0x02: class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> - { - virtual cChunkData::sChunkSection * Allocate() + { + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - - virtual void Free(cChunkData::sChunkSection * a_Ptr) + + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override + { + return false; + } } Pool; cChunkData Data(Pool); cChunkDef::BlockTypes BlockTypes; diff --git a/tests/ChunkData/creatable.cpp b/tests/ChunkData/creatable.cpp index a879c3dd7..260583213 100644 --- a/tests/ChunkData/creatable.cpp +++ b/tests/ChunkData/creatable.cpp @@ -8,16 +8,21 @@ int main(int argc, char** argv) class cMockAllocationPool : public cAllocationPool<cChunkData::sChunkSection> - { - virtual cChunkData::sChunkSection * Allocate() + { + virtual cChunkData::sChunkSection * Allocate() override { return new cChunkData::sChunkSection(); } - - virtual void Free(cChunkData::sChunkSection * a_Ptr) + + virtual void Free(cChunkData::sChunkSection * a_Ptr) override { delete a_Ptr; } + + virtual bool DoIsEqual(const cAllocationPool<cChunkData::sChunkSection> &) const NOEXCEPT override + { + return false; + } } Pool; cChunkData buffer(Pool); return 0; |