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.h | |
| 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.h')
| -rw-r--r-- | src/clientobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/clientobject.h b/src/clientobject.h index aa0ec9c56..a3eb3e242 100644 --- a/src/clientobject.h +++ b/src/clientobject.h @@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes_extrabloated.h" #include "activeobject.h" #include <map> -#include "util/cpp11_container.h" +#include <unordered_map> class ClientEnvironment; class ITextureSource; @@ -89,7 +89,7 @@ protected: ClientEnvironment *m_env; private: // Used for creating objects based on type - static UNORDERED_MAP<u16, Factory> m_types; + static std::unordered_map<u16, Factory> m_types; }; struct DistanceSortedActiveObject |