diff options
| author | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-08-10 12:08:05 +0200 |
|---|---|---|
| committer | est31 <est31@users.noreply.github.com> | 2016-08-10 12:08:05 +0200 |
| commit | 058a869b70072aba8baea47e359c45e82daaf152 (patch) | |
| tree | b0dd1820e89975d7172836d4861d9ab2ae2b472d /src/mg_decoration.h | |
| parent | 8df89db30e80eff2ebbf30f0331b8ab4906a410e (diff) | |
| download | minetest-058a869b70072aba8baea47e359c45e82daaf152.tar.gz minetest-058a869b70072aba8baea47e359c45e82daaf152.tar.bz2 minetest-058a869b70072aba8baea47e359c45e82daaf152.zip | |
Permit usage of std::unordered_map & std::unorderered_set on c++11 compilers (#4430)
This fallback to std::map & std::set for older compilers
Use UNORDERED_SET as an example in decoration and ore biome sets
Use UNORDERED_MAP as an example in nameidmapping
Diffstat (limited to 'src/mg_decoration.h')
| -rw-r--r-- | src/mg_decoration.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mg_decoration.h b/src/mg_decoration.h index ba3e9d3b2..da98fd482 100644 --- a/src/mg_decoration.h +++ b/src/mg_decoration.h @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MG_DECORATION_HEADER #define MG_DECORATION_HEADER -#include <set> +#include "util/cpp11_container.h" #include "objdef.h" #include "noise.h" #include "nodedef.h" @@ -83,7 +83,7 @@ public: float fill_ratio; NoiseParams np; - std::set<u8> biomes; + UNORDERED_SET<u8> biomes; //std::list<CutoffData> cutoffs; //Mutex cutoff_mutex; }; |