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/tool.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/tool.h')
| -rw-r--r-- | src/tool.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tool.h b/src/tool.h index f33152355..083328d06 100644 --- a/src/tool.h +++ b/src/tool.h @@ -23,12 +23,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "irrlichttypes.h" #include <string> #include <iostream> -#include "util/cpp11_container.h" #include "itemgroup.h" struct ToolGroupCap { - UNORDERED_MAP<int, float> times; + std::unordered_map<int, float> times; int maxlevel; int uses; @@ -39,7 +38,7 @@ struct ToolGroupCap bool getTime(int rating, float *time) const { - UNORDERED_MAP<int, float>::const_iterator i = times.find(rating); + std::unordered_map<int, float>::const_iterator i = times.find(rating); if (i == times.end()) { *time = 0; return false; @@ -50,8 +49,8 @@ struct ToolGroupCap }; -typedef UNORDERED_MAP<std::string, struct ToolGroupCap> ToolGCMap; -typedef UNORDERED_MAP<std::string, s16> DamageGroup; +typedef std::unordered_map<std::string, struct ToolGroupCap> ToolGCMap; +typedef std::unordered_map<std::string, s16> DamageGroup; struct ToolCapabilities { |