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/mods.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/mods.h')
-rw-r--r-- | src/mods.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mods.h b/src/mods.h index 7455a51ea..792280b8b 100644 --- a/src/mods.h +++ b/src/mods.h @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <string> #include <map> #include <json/json.h> -#include "util/cpp11_container.h" +#include <unordered_set> #include "config.h" #include "metadata.h" @@ -38,9 +38,9 @@ struct ModSpec std::string name; std::string path; //if normal mod: - UNORDERED_SET<std::string> depends; - UNORDERED_SET<std::string> optdepends; - UNORDERED_SET<std::string> unsatisfied_depends; + std::unordered_set<std::string> depends; + std::unordered_set<std::string> optdepends; + std::unordered_set<std::string> unsatisfied_depends; bool part_of_modpack; bool is_modpack; @@ -125,7 +125,7 @@ private: // 1. game mod in modpack; 2. game mod; // 3. world mod in modpack; 4. world mod; // 5. addon mod in modpack; 6. addon mod. - UNORDERED_SET<std::string> m_name_conflicts; + std::unordered_set<std::string> m_name_conflicts; // Deleted default constructor ModConfiguration() {} |