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/util/string.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/util/string.h')
| -rw-r--r-- | src/util/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/string.h b/src/util/string.h index cc278da13..c0f4beefb 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #define UTIL_STRING_HEADER #include "irrlichttypes_bloated.h" -#include "cpp11_container.h" #include <stdlib.h> #include <string> #include <cstring> @@ -30,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <sstream> #include <iomanip> #include <cctype> +#include <unordered_map> #define STRINGIFY(x) #x #define TOSTRING(x) STRINGIFY(x) @@ -55,7 +55,7 @@ with this program; if not, write to the Free Software Foundation, Inc., (((unsigned char)(x) < 0xe0) ? 2 : \ (((unsigned char)(x) < 0xf0) ? 3 : 4)) -typedef UNORDERED_MAP<std::string, std::string> StringMap; +typedef std::unordered_map<std::string, std::string> StringMap; struct FlagDesc { const char *name; |