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

2017-06-04 21:00:04 +02:00
parent 2362d3f926
commit a98baef5e4
59 changed files with 223 additions and 298 deletions
--- a/src/mg_decoration.cpp
+++ b/src/mg_decoration.cpp
@@ -208,14 +208,11 @@ size_t Decoration::placeDeco(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax)
 #endif
 			}

-			if (mg->biomemap) {
-				UNORDERED_SET<u8>::iterator iter;
-
-				if (!biomes.empty()) {
-					iter = biomes.find(mg->biomemap[mapindex]);
-					if (iter == biomes.end())
-						continue;
-				}
+			if (mg->biomemap && !biomes.empty()) {
+				std::unordered_set<u8>::const_iterator iter =
+					biomes.find(mg->biomemap[mapindex]);
+				if (iter == biomes.end())
+					continue;
 			}

 			v3s16 pos(x, y, z);