LBM content mapping map doesn't need to be ordered, use std::unordered_map

nerzhul · nerzhul · commit a8c405b04ea1 · 2017-07-18T08:23:37.000+02:00
Also rename helper to lbm_map instead of container_map
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp
@@ -109,7 +109,7 @@ void LBMContentMapping::addLBM(LoadingBlockModifierDef *lbm_def, IGameDef *gamed
 const std::vector<LoadingBlockModifierDef *> *
 LBMContentMapping::lookup(content_t c) const
 {
-	container_map::const_iterator it = map.find(c);
+	lbm_map::const_iterator it = map.find(c);
 	if (it == map.end())
 		return NULL;
 	// This first dereferences the iterator, returning
diff --git a/src/serverenvironment.h b/src/serverenvironment.h
@@ -88,8 +88,8 @@ struct LoadingBlockModifierDef
 
 struct LBMContentMapping
 {
-	typedef std::map<content_t, std::vector<LoadingBlockModifierDef *> > container_map;
-	container_map map;
+	typedef std::unordered_map<content_t, std::vector<LoadingBlockModifierDef *>> lbm_map;
+	lbm_map map;
 
 	std::vector<LoadingBlockModifierDef *> lbm_list;
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ void LBMContentMapping::addLBM(LoadingBlockModifierDef lbm_def, IGameDef gamed`
`109`	`109`	`const std::vector<LoadingBlockModifierDef > `
`110`	`110`	`LBMContentMapping::lookup(content_t c) const`
`111`	`111`	`{`
`112`		`- container_map::const_iterator it = map.find(c);`
	`112`	`+ lbm_map::const_iterator it = map.find(c);`
`113`	`113`	`if (it == map.end())`
`114`	`114`	`return NULL;`
`115`	`115`	`// This first dereferences the iterator, returning`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,8 @@ struct LoadingBlockModifierDef`
`88`	`88`
`89`	`89`	`struct LBMContentMapping`
`90`	`90`	`{`
`91`		`- typedef std::map<content_t, std::vector<LoadingBlockModifierDef *> > container_map;`
`92`		`- container_map map;`
	`91`	`+ typedef std::unordered_map<content_t, std::vector<LoadingBlockModifierDef *>> lbm_map;`
	`92`	`+ lbm_map map;`
`93`	`93`
`94`	`94`	`std::vector<LoadingBlockModifierDef *> lbm_list;`
`95`	`95`