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.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/content_cao.h')
| -rw-r--r-- | src/content_cao.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/content_cao.h b/src/content_cao.h index 412cdff12..e5b23aa35 100644 --- a/src/content_cao.h +++ b/src/content_cao.h @@ -91,7 +91,8 @@ private: int m_animation_speed; int m_animation_blend; bool m_animation_loop; - UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position; // stores position and rotation for each bone name + // stores position and rotation for each bone name + std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position; std::string m_attachment_bone; v3f m_attachment_position; v3f m_attachment_rotation; |