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/client | |
| 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/client')
| -rw-r--r-- | src/client/tile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 99495132b..0918836e5 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -427,7 +427,7 @@ private: std::vector<video::ITexture*> m_texture_trash; // Maps image file names to loaded palettes. - UNORDERED_MAP<std::string, Palette> m_palettes; + std::unordered_map<std::string, Palette> m_palettes; // Cached settings needed for making textures from meshes bool m_setting_trilinear_filter; @@ -700,7 +700,7 @@ Palette* TextureSource::getPalette(const std::string &name) if (name == "") return NULL; - UNORDERED_MAP<std::string, Palette>::iterator it = m_palettes.find(name); + std::unordered_map<std::string, Palette>::iterator it = m_palettes.find(name); if (it == m_palettes.end()) { // Create palette video::IImage *img = generateImage(name); |