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/clientobject.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/clientobject.cpp')
| -rw-r--r-- | src/clientobject.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/clientobject.cpp b/src/clientobject.cpp index 89a0474a4..329f10469 100644 --- a/src/clientobject.cpp +++ b/src/clientobject.cpp @@ -42,8 +42,8 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type, Client *client, ClientEnvironment *env) { // Find factory function - UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type); - if(n == m_types.end()) { + std::unordered_map<u16, Factory>::iterator n = m_types.find(type); + if (n == m_types.end()) { // If factory is not found, just return. warningstream << "ClientActiveObject: No factory for type=" << (int)type << std::endl; @@ -57,7 +57,7 @@ ClientActiveObject* ClientActiveObject::create(ActiveObjectType type, void ClientActiveObject::registerType(u16 type, Factory f) { - UNORDERED_MAP<u16, Factory>::iterator n = m_types.find(type); + std::unordered_map<u16, Factory>::iterator n = m_types.find(type); if(n != m_types.end()) return; m_types[type] = f; |