diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2017-06-03 14:55:10 -0400 |
| commit | caecdb681c428c1aab9c0f7eec2570c0460f995c (patch) | |
| tree | e5115982ea59bbf2343ba9b35bc4a0cfbb56f407 /src/util/cpp11_container.h | |
| parent | 81d56b94919dceb7b2e51d70b21a7ca22f852bd5 (diff) | |
| parent | 80dc961d24e1964e25d57039ddb2ba639f9f4d22 (diff) | |
| download | minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.gz minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.tar.bz2 minetest-caecdb681c428c1aab9c0f7eec2570c0460f995c.zip | |
Merge 0.4.16 into stable-0.4
Diffstat (limited to 'src/util/cpp11_container.h')
| -rw-r--r-- | src/util/cpp11_container.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/util/cpp11_container.h b/src/util/cpp11_container.h index 88317c9c4..0194385fc 100644 --- a/src/util/cpp11_container.h +++ b/src/util/cpp11_container.h @@ -29,15 +29,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #ifdef USE_UNORDERED_CONTAINERS - #include <unordered_map> - #include <unordered_set> - #define UNORDERED_MAP std::unordered_map - #define UNORDERED_SET std::unordered_set +#include <unordered_map> +#include <unordered_set> +#define UNORDERED_MAP std::unordered_map +#define UNORDERED_SET std::unordered_set #else - #include <map> - #include <set> - #define UNORDERED_MAP std::map - #define UNORDERED_SET std::set +#include <map> +#include <set> +#define UNORDERED_MAP std::map +#define UNORDERED_SET std::set #endif #endif |