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_ore.h | |
| parent | 2362d3f926e2702585f60011d4cea90b4faf4bd6 (diff) | |
| download | dragonfireclient-a98baef5e4fedca36c8c8755ad7c8233469f6a3f.tar.xz | |
C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821)
Diffstat (limited to 'src/mg_ore.h')
| -rw-r--r-- | src/mg_ore.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mg_ore.h b/src/mg_ore.h index 0503a6ca0..77025e1bb 100644 --- a/src/mg_ore.h +++ b/src/mg_ore.h @@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef MG_ORE_HEADER #define MG_ORE_HEADER -#include "util/cpp11_container.h" +#include <unordered_set> #include "objdef.h" #include "noise.h" #include "nodedef.h" @@ -66,7 +66,7 @@ public: float nthresh; // threshold for noise at which an ore is placed NoiseParams np; // noise for distribution of clusters (NULL for uniform scattering) Noise *noise; - UNORDERED_SET<u8> biomes; + std::unordered_set<u8> biomes; Ore(); virtual ~Ore(); |