Fix a memleak pointed by @Zeno- in MeshUpdateQueue

[oweals/minetest.git] / src / itemgroup.h

diff --git a/src/itemgroup.h b/src/itemgroup.h
index 927811dd08016fed7ac80065774922843b07bfbc..2206857fd48b652c466246418b820ec0f59bce28 100644 (file)
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -20,20 +20,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef ITEMGROUP_HEADER
 #define ITEMGROUP_HEADER
 
-#include "common_irrlicht.h"
 #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)
+static inline int itemgroup_get(const ItemGroupList &groups, const std::string &name)
 {
-       std::map<std::string, int>::const_iterator i = groups.find(name);
-       if(i == groups.end())
+       ItemGroupList::const_iterator i = groups.find(name);
+       if (i == groups.end())
                return 0;
        return i->second;
 }
 
 #endif
-