diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-04 21:00:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 21:00:04 +0200 |
| commit | a98baef5e4fedca36c8c8755ad7c8233469f6a3f (patch) | |
| tree | c40d1468774cf988b4567f33e89875e0c43803a7 /src/nodedef.cpp | |
| parent | 2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff) | |
| download | minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.gz minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.bz2 minetest-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.zip | |
C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)
Diffstat (limited to 'src/nodedef.cpp')
| -rw-r--r-- | src/nodedef.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp index 98b34ea9e..6b2718636 100644 --- a/src/nodedef.cpp +++ b/src/nodedef.cpp @@ -912,12 +912,12 @@ private: // item aliases too. Updated by updateAliases() // Note: Not serialized. - UNORDERED_MAP<std::string, content_t> m_name_id_mapping_with_aliases; + std::unordered_map<std::string, content_t> m_name_id_mapping_with_aliases; // A mapping from groups to a list of content_ts (and their levels) // that belong to it. Necessary for a direct lookup in getIds(). // Note: Not serialized. - UNORDERED_MAP<std::string, GroupItems> m_group_to_items; + std::unordered_map<std::string, GroupItems> m_group_to_items; // Next possibly free id content_t m_next_id; @@ -1050,7 +1050,7 @@ inline const ContentFeatures& CNodeDefManager::get(const MapNode &n) const bool CNodeDefManager::getId(const std::string &name, content_t &result) const { - UNORDERED_MAP<std::string, content_t>::const_iterator + std::unordered_map<std::string, content_t>::const_iterator i = m_name_id_mapping_with_aliases.find(name); if(i == m_name_id_mapping_with_aliases.end()) return false; @@ -1080,7 +1080,7 @@ bool CNodeDefManager::getIds(const std::string &name, } std::string group = name.substr(6); - UNORDERED_MAP<std::string, GroupItems>::const_iterator + std::unordered_map<std::string, GroupItems>::const_iterator i = m_group_to_items.find(group); if (i == m_group_to_items.end()) return true; @@ -1282,7 +1282,7 @@ content_t CNodeDefManager::set(const std::string &name, const ContentFeatures &d i != def.groups.end(); ++i) { std::string group_name = i->first; - UNORDERED_MAP<std::string, GroupItems>::iterator + std::unordered_map<std::string, GroupItems>::iterator j = m_group_to_items.find(group_name); if (j == m_group_to_items.end()) { m_group_to_items[group_name].push_back( @@ -1318,7 +1318,7 @@ void CNodeDefManager::removeNode(const std::string &name) } // Erase node content from all groups it belongs to - for (UNORDERED_MAP<std::string, GroupItems>::iterator iter_groups = + for (std::unordered_map<std::string, GroupItems>::iterator iter_groups = m_group_to_items.begin(); iter_groups != m_group_to_items.end();) { GroupItems &items = iter_groups->second; for (GroupItems::iterator iter_groupitems = items.begin(); |