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

Replace &*[0] accesses with .data()

Browse Source
This commit is contained in:
Tiger Wang 2014-10-21 13:20:06 +01:00
parent 987f79afdd
commit 5089f04cf6
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/UI/SlotArea.cpp
View File

@ -2321,8 +2321,8 @@ cItem * cSlotAreaTemporary::GetPlayerSlots(cPlayer & a_Player)
if (itr == m_Items.end()) if (itr == m_Items.end())
{ {
return nullptr; return nullptr;
} }
return &(itr->second[0]); return itr->second.data();
} }

8
src/WorldStorage/FireworksSerializer.cpp
View File

@ -22,11 +22,11 @@ void cFireworkItem::WriteToNBTCompound(const cFireworkItem & a_FireworkItem, cFa
a_Writer.AddByte("Type", a_FireworkItem.m_Type); a_Writer.AddByte("Type", a_FireworkItem.m_Type);
if (!a_FireworkItem.m_Colours.empty()) if (!a_FireworkItem.m_Colours.empty())
{ {
a_Writer.AddIntArray("Colors", &(a_FireworkItem.m_Colours[0]), a_FireworkItem.m_Colours.size()); a_Writer.AddIntArray("Colors", a_FireworkItem.m_Colours.data(), a_FireworkItem.m_Colours.size());
} }
if (!a_FireworkItem.m_FadeColours.empty()) if (!a_FireworkItem.m_FadeColours.empty())
{ {
a_Writer.AddIntArray("FadeColors", &(a_FireworkItem.m_FadeColours[0]), a_FireworkItem.m_FadeColours.size()); a_Writer.AddIntArray("FadeColors", a_FireworkItem.m_FadeColours.data(), a_FireworkItem.m_FadeColours.size());
} }
a_Writer.EndCompound(); a_Writer.EndCompound();
a_Writer.EndList(); a_Writer.EndList();
@ -41,11 +41,11 @@ void cFireworkItem::WriteToNBTCompound(const cFireworkItem & a_FireworkItem, cFa
a_Writer.AddByte("Type", a_FireworkItem.m_Type); a_Writer.AddByte("Type", a_FireworkItem.m_Type);
if (!a_FireworkItem.m_Colours.empty()) if (!a_FireworkItem.m_Colours.empty())
{ {
a_Writer.AddIntArray("Colors", &(a_FireworkItem.m_Colours[0]), a_FireworkItem.m_Colours.size()); a_Writer.AddIntArray("Colors", a_FireworkItem.m_Colours.data(), a_FireworkItem.m_Colours.size());
} }
if (!a_FireworkItem.m_FadeColours.empty()) if (!a_FireworkItem.m_FadeColours.empty())
{ {
a_Writer.AddIntArray("FadeColors", &(a_FireworkItem.m_FadeColours[0]), a_FireworkItem.m_FadeColours.size()); a_Writer.AddIntArray("FadeColors", a_FireworkItem.m_FadeColours.data(), a_FireworkItem.m_FadeColours.size());
} }
a_Writer.EndCompound(); a_Writer.EndCompound();
break; break;

4
src/WorldStorage/MapSerializer.cpp
View File

@ -112,7 +112,7 @@ void cMapSerializer::SaveMapToNBT(cFastNBTWriter & a_Writer)
a_Writer.AddInt("zCenter", m_Map->GetCenterZ()); a_Writer.AddInt("zCenter", m_Map->GetCenterZ());
const cMap::cColorList & Data = m_Map->GetData(); const cMap::cColorList & Data = m_Map->GetData();
a_Writer.AddByteArray("colors", (char *) &Data[0], Data.size()); a_Writer.AddByteArray("colors", (char *)Data.data(), Data.size());
a_Writer.EndCompound(); a_Writer.EndCompound();
} }
@ -190,7 +190,7 @@ bool cMapSerializer::LoadMapFromNBT(const cParsedNBT & a_NBT)
CurrLine = a_NBT.FindChildByName(Data, "colors"); CurrLine = a_NBT.FindChildByName(Data, "colors");
if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_ByteArray)) if ((CurrLine >= 0) && (a_NBT.GetType(CurrLine) == TAG_ByteArray))
{ {
memcpy(&m_Map->m_Data[0], a_NBT.GetData(CurrLine), NumPixels); memcpy(m_Map->m_Data.data(), a_NBT.GetData(CurrLine), NumPixels);
} }
return true; return true;