PostgreSQL: Fix listAllLoadableBlocks returning the same block

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

diff --git a/src/itemgroup.h b/src/itemgroup.h
index 3a07e9e022a986e1e54a6d2184dd97a37eeb06dd..fcf72064979bcc600b7254e13719c194c17bac72 100644 (file)
--- a/src/itemgroup.h
+++ b/src/itemgroup.h
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+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 Lesser General Public License as published by
@@ -17,23 +17,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef ITEMGROUP_HEADER
-#define ITEMGROUP_HEADER
+#pragma once
 
-#include "irrlichttypes_extrabloated.h"
 #include <string>
-#include <map>
+#include <unordered_map>
 
-typedef std::map<std::string, int> ItemGroupList;
+typedef std::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
-