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/mg_ore.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/mg_ore.cpp')
| -rw-r--r-- | src/mg_ore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mg_ore.cpp b/src/mg_ore.cpp index 89319238e..6275de313 100644 --- a/src/mg_ore.cpp +++ b/src/mg_ore.cpp @@ -150,7 +150,7 @@ void OreScatter::generate(MMVManip *vm, int mapseed, u32 blockseed, if (biomemap && !biomes.empty()) { u32 index = sizex * (z0 - nmin.Z) + (x0 - nmin.X); - UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]); + std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[index]); if (it == biomes.end()) continue; } @@ -204,7 +204,7 @@ void OreSheet::generate(MMVManip *vm, int mapseed, u32 blockseed, continue; if (biomemap && !biomes.empty()) { - UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]); + std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[index]); if (it == biomes.end()) continue; } @@ -272,7 +272,7 @@ void OrePuff::generate(MMVManip *vm, int mapseed, u32 blockseed, continue; if (biomemap && !biomes.empty()) { - UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[index]); + std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[index]); if (it == biomes.end()) continue; } @@ -340,7 +340,7 @@ void OreBlob::generate(MMVManip *vm, int mapseed, u32 blockseed, if (biomemap && !biomes.empty()) { u32 bmapidx = sizex * (z0 - nmin.Z) + (x0 - nmin.X); - UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[bmapidx]); + std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[bmapidx]); if (it == biomes.end()) continue; } @@ -424,7 +424,7 @@ void OreVein::generate(MMVManip *vm, int mapseed, u32 blockseed, if (biomemap && !biomes.empty()) { u32 bmapidx = sizex * (z - nmin.Z) + (x - nmin.X); - UNORDERED_SET<u8>::iterator it = biomes.find(biomemap[bmapidx]); + std::unordered_set<u8>::const_iterator it = biomes.find(biomemap[bmapidx]); if (it == biomes.end()) continue; } |