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/content_cao.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/content_cao.cpp')
| -rw-r--r-- | src/content_cao.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index d15c53e7a..c904082d6 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Settings; struct ToolCapabilities; -UNORDERED_MAP<u16, ClientActiveObject::Factory> ClientActiveObject::m_types; +std::unordered_map<u16, ClientActiveObject::Factory> ClientActiveObject::m_types; SmoothTranslator::SmoothTranslator(): vect_old(0,0,0), @@ -565,7 +565,7 @@ GenericCAO::GenericCAO(Client *client, ClientEnvironment *env): m_animation_speed(15), m_animation_blend(0), m_animation_loop(true), - m_bone_position(UNORDERED_MAP<std::string, core::vector2d<v3f> >()), + m_bone_position(), m_attachment_bone(""), m_attachment_position(v3f(0,0,0)), m_attachment_rotation(v3f(0,0,0)), @@ -1493,7 +1493,7 @@ void GenericCAO::updateBonePosition() return; m_animated_meshnode->setJointMode(irr::scene::EJUOR_CONTROL); // To write positions to the mesh on render - for(UNORDERED_MAP<std::string, core::vector2d<v3f> >::const_iterator + for(std::unordered_map<std::string, core::vector2d<v3f>>::const_iterator ii = m_bone_position.begin(); ii != m_bone_position.end(); ++ii) { std::string bone_name = (*ii).first; v3f bone_pos = (*ii).second.X; |