diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 21:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 21:00:04 +0200 |
| commit | a98baef5e4fedca36c8c8755ad7c8233469f6a3f (patch) | |
| tree | c40d1468774cf988b4567f33e89875e0c43803a7 /src/mapsector.cpp | |
| parent | 2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff) | |
| download | minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.gz minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.bz2 minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.zip | |
C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)
Diffstat (limited to 'src/mapsector.cpp')
| -rw-r--r-- | src/mapsector.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mapsector.cpp b/src/mapsector.cpp index 410689f5e..ad7cb7b70 100644 --- a/src/mapsector.cpp +++ b/src/mapsector.cpp @@ -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); } |