flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fix assignment operators

Browse Source
This commit is contained in:
worktycho 2014-05-17 14:04:44 +01:00
parent a7a811af3a
commit 7777da379d
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ChunkBuffer.h
View File

@ -53,21 +53,25 @@ public:
other.IsOwner = false;
}
void operator=(const cChunkBuffer& other)
cChunkBuffer& operator=(const cChunkBuffer& other)
{
if(IsOwner)
if(&other == this)
{
if(IsOwner)
{
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{
if(m_Sections[i]) Free(m_Sections[i]);;
}
}
IsOwner = true;
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{
if(m_Sections[i]) Free(m_Sections[i]);;
m_Sections[i] = other.m_Sections[i];
}
other.IsOwner = false;
}
IsOwner = true;
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{
m_Sections[i] = other.m_Sections[i];
}
other.IsOwner = false;
}
#else
// unique_ptr style interface for memory management
@ -79,7 +83,7 @@ public:
}
}
void operator=(const cChunkBuffer&& other)
cChunkBuffer& operator=(const cChunkBuffer&& other)
{
for (int i = 0; i < CHUNK_SECTION_NUM; i++)
{