summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-06-14 19:11:43 +0200
committerTycho <work.tycho+git@gmail.com>2014-06-14 19:11:43 +0200
commitf6af584efa60d23c06abdc86dbfdfc85da23a3dc (patch)
treeb483ea384388e957990689989cde3f1efa578354
parentFill with buffer on startup (diff)
downloadcuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar.gz
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar.bz2
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar.lz
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar.xz
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.tar.zst
cuberite-f6af584efa60d23c06abdc86dbfdfc85da23a3dc.zip
Diffstat (limited to '')
-rw-r--r--src/ChunkData.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChunkData.cpp b/src/ChunkData.cpp
index a80b1de0f..d2903cff1 100644
--- a/src/ChunkData.cpp
+++ b/src/ChunkData.cpp
@@ -68,7 +68,7 @@ cChunkData::~cChunkData()
// auto_ptr style interface for memory management
cChunkData::cChunkData(const cChunkData & a_Other) :
m_IsOwner(true),
- m_Pool(other.m_Pool)
+ m_Pool(a_Other.m_Pool)
{
// Move contents and ownership from a_Other to this, pointer-wise:
for (size_t i = 0; i < NumSections; i++)
@@ -107,7 +107,7 @@ cChunkData::~cChunkData()
m_Sections[i] = a_Other.m_Sections[i];
}
a_Other.m_IsOwner = false;
- ASSERT(&m_Pool == &other.m_Pool);
+ ASSERT(&m_Pool == &a_Other.m_Pool);
return *this;
}
@@ -327,7 +327,7 @@ cChunkData cChunkData::Copy(void) const
{
if (m_Sections[i] != NULL)
{
- copy.m_Sections[i] = Allocate();
+ copy.m_Sections[i] = copy.Allocate();
*copy.m_Sections[i] = *m_Sections[i];
}
}