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/settings.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/settings.h')
| -rw-r--r-- | src/settings.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/settings.h b/src/settings.h index 8c4f6e559..e570c1a84 100644 --- a/src/settings.h +++ b/src/settings.h @@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/string.h" #include "threading/mutex.h" #include <string> -#include "util/cpp11_container.h" #include <list> #include <set> @@ -45,7 +44,7 @@ typedef std::vector< > > SettingsCallbackList; -typedef UNORDERED_MAP<std::string, SettingsCallbackList> SettingsCallbackMap; +typedef std::unordered_map<std::string, SettingsCallbackList> SettingsCallbackMap; enum ValueType { VALUETYPE_STRING, @@ -95,7 +94,7 @@ struct SettingsEntry { bool is_group; }; -typedef UNORDERED_MAP<std::string, SettingsEntry> SettingEntries; +typedef std::unordered_map<std::string, SettingsEntry> SettingEntries; class Settings { public: |