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_sao.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_sao.h')
| -rw-r--r-- | src/content_sao.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 0dad54805..bb1a61a19 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -52,7 +52,7 @@ public: void getAttachment(int *parent_id, std::string *bone, v3f *position, v3f *rotation); void addAttachmentChild(int child_id); void removeAttachmentChild(int child_id); - const UNORDERED_SET<int> &getAttachmentChildIds(); + const std::unordered_set<int> &getAttachmentChildIds(); ObjectProperties* accessObjectProperties(); void notifyObjectPropertiesModified(); protected: @@ -72,11 +72,11 @@ protected: bool m_animation_sent; // Stores position and rotation for each bone name - UNORDERED_MAP<std::string, core::vector2d<v3f> > m_bone_position; + std::unordered_map<std::string, core::vector2d<v3f>> m_bone_position; bool m_bone_position_sent; int m_attachment_parent_id; - UNORDERED_SET<int> m_attachment_child_ids; + std::unordered_set<int> m_attachment_child_ids; std::string m_attachment_bone; v3f m_attachment_position; v3f m_attachment_rotation; @@ -188,7 +188,7 @@ public: } }; -typedef UNORDERED_MAP<std::string, std::string> PlayerAttributes; +typedef std::unordered_map<std::string, std::string> PlayerAttributes; class RemotePlayer; class PlayerSAO : public UnitSAO |