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/mg_decoration.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/mg_decoration.h')
| -rw-r--r-- | src/mg_decoration.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mg_decoration.h b/src/mg_decoration.h index 950800ec8..6a48796d8 100644 --- a/src/mg_decoration.h +++ b/src/mg_decoration.h @@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MG_DECORATION_HEADER #define MG_DECORATION_HEADER -#include "util/cpp11_container.h" +#include <unordered_set> #include "objdef.h" #include "noise.h" #include "nodedef.h" @@ -87,9 +87,7 @@ public: std::vector<content_t> c_spawnby; s16 nspawnby; - UNORDERED_SET<u8> biomes; - //std::list<CutoffData> cutoffs; - //Mutex cutoff_mutex; + std::unordered_set<u8> biomes; }; class DecoSimple : public Decoration { |