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

cSetChunkData constructor explicitly requires std::move() instead of

Browse Source 
unsafely stealing data
This commit is contained in:
Woazboat
2015-04-27 21:18:21 +02:00
parent 0bfcd62556
commit 6caf08da99
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SetChunkData.cpp
View File

@@ -33,8 +33,8 @@ cSetChunkData::cSetChunkData(
const NIBBLETYPE * a_SkyLight,
const cChunkDef::HeightMap * a_HeightMap,
const cChunkDef::BiomeMap * a_Biomes,
cEntityList & a_Entities,
cBlockEntityList & a_BlockEntities,
cEntityList && a_Entities,
cBlockEntityList && a_BlockEntities,
bool a_ShouldMarkDirty
) :
m_ChunkX(a_ChunkX),
@@ -84,8 +84,8 @@ cSetChunkData::cSetChunkData(
}
// Move entities and blockentities:
std::swap(m_Entities, a_Entities);
std::swap(m_BlockEntities, a_BlockEntities);
m_Entities = std::move(a_Entities);
m_BlockEntities = std::move(a_BlockEntities);
}