diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2017-07-18 08:23:37 +0200 |
---|---|---|
committer | Loic Blot <loic.blot@unix-experience.fr> | 2017-07-18 08:23:37 +0200 |
commit | a8c405b04ea1be927d8ebc753ce7ccb46cfdd4f9 (patch) | |
tree | f12ae62c4a77854024e75f157cd77ee3d9c840dc /src | |
parent | 14a1a712de801ac11fd6203d6169abc194eab5b3 (diff) | |
download | minetest-a8c405b04ea1be927d8ebc753ce7ccb46cfdd4f9.tar.gz minetest-a8c405b04ea1be927d8ebc753ce7ccb46cfdd4f9.tar.bz2 minetest-a8c405b04ea1be927d8ebc753ce7ccb46cfdd4f9.zip |
LBM content mapping map doesn't need to be ordered, use std::unordered_map
Also rename helper to lbm_map instead of container_map
Diffstat (limited to 'src')
-rw-r--r-- | src/serverenvironment.cpp | 2 | ||||
-rw-r--r-- | src/serverenvironment.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/serverenvironment.cpp b/src/serverenvironment.cpp index 11c71e28e..bf4b3c0e3 100644 --- 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 index 48eb5b318..4cfe7f7d6 100644 --- 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; |