diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-05 09:03:55 +0200 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-05 10:53:19 +0200 |
| commit | 613797a3048907275ceebe29582b9fc2761b1f25 (patch) | |
| tree | 1d8f90a75c86dd3a32a72d3789bc108042d8f65d /src/itemgroup.h | |
| parent | 5f084cd98d7b3326b51320455364337539710efd (diff) | |
| download | minetest-613797a3048907275ceebe29582b9fc2761b1f25.tar.gz minetest-613797a3048907275ceebe29582b9fc2761b1f25.tar.bz2 minetest-613797a3048907275ceebe29582b9fc2761b1f25.zip | |
Replace various std::map with UNORDERED_MAP + various cleanups
This is part 2 for 5f084cd98d7b3326b51320455364337539710efd
Other improvements:
* Use the defined ItemGroupList when used
* make Client::checkPrivilege const
* inline some trivial functions
* Add ActiveObjectMap typedef
* Add SettingsEntries typedef
Diffstat (limited to 'src/itemgroup.h')
| -rw-r--r-- | src/itemgroup.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/itemgroup.h b/src/itemgroup.h index f6ae86736..f91ccc221 100644 --- a/src/itemgroup.h +++ b/src/itemgroup.h @@ -21,14 +21,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #define ITEMGROUP_HEADER #include <string> -#include <map> +#include "util/cpp11_container.h" -typedef std::map<std::string, int> ItemGroupList; +typedef UNORDERED_MAP<std::string, int> ItemGroupList; static inline int itemgroup_get(const ItemGroupList &groups, const std::string &name) { - std::map<std::string, int>::const_iterator i = groups.find(name); + ItemGroupList::const_iterator i = groups.find(name); if(i == groups.end()) return 0; return i->second; |