oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)

Browse source
This commit is contained in:
Loïc Blot 2017-06-04 21:00:04 +02:00 • committed by GitHub
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/mapsector.cpp
View file

@ -42,7 +42,7 @@ void MapSector::deleteBlocks()
m_block_cache = NULL;
// Delete all
for (UNORDERED_MAP<s16, MapBlock*>::iterator i = m_blocks.begin();
for (std::unordered_map<s16, MapBlock*>::iterator i = m_blocks.begin();
i != m_blocks.end(); ++i) {
delete i->second;
}
@ -60,7 +60,7 @@ MapBlock * MapSector::getBlockBuffered(s16 y)
}
// If block doesn't exist, return NULL
UNORDERED_MAP<s16, MapBlock*>::iterator n = m_blocks.find(y);
std::unordered_map<s16, MapBlock*>::const_iterator n = m_blocks.find(y);
block = (n != m_blocks.end() ? n->second : NULL);
// Cache the last result
@ -127,7 +127,7 @@ void MapSector::deleteBlock(MapBlock *block)
void MapSector::getBlocks(MapBlockVect &dest)
{
for (UNORDERED_MAP<s16, MapBlock*>::iterator bi = m_blocks.begin();
for (std::unordered_map<s16, MapBlock*>::iterator bi = m_blocks.begin();
bi != m_blocks.end(); ++bi) {
dest.push_back(bi->second);
}