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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/mods.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/mods.cpp b/src/mods.cpp index 0e583b2db..5a71ca2d4 100644 --- a/src/mods.cpp +++ b/src/mods.cpp @@ -144,7 +144,8 @@ void ModConfiguration::printUnsatisfiedModsError() const it != m_unsatisfied_mods.end(); ++it) { ModSpec mod = *it; errorstream << "mod \"" << mod.name << "\" has unsatisfied dependencies: "; - for (UNORDERED_SET<std::string>::iterator dep_it = mod.unsatisfied_depends.begin(); + for (std::unordered_set<std::string>::iterator dep_it = + mod.unsatisfied_depends.begin(); dep_it != mod.unsatisfied_depends.end(); ++dep_it) errorstream << " \"" << *dep_it << "\""; errorstream << std::endl; @@ -268,8 +269,8 @@ void ModConfiguration::checkConflictsAndDeps() // report on name conflicts if (!m_name_conflicts.empty()) { std::string s = "Unresolved name conflicts for mods "; - for (UNORDERED_SET<std::string>::const_iterator it = m_name_conflicts.begin(); - it != m_name_conflicts.end(); ++it) { + for (std::unordered_set<std::string>::const_iterator it = + m_name_conflicts.begin(); it != m_name_conflicts.end(); ++it) { if (it != m_name_conflicts.begin()) s += ", "; s += std::string("\"") + (*it) + "\""; } @@ -299,7 +300,7 @@ void ModConfiguration::resolveDependencies() ModSpec mod = *it; mod.unsatisfied_depends = mod.depends; // check which optional dependencies actually exist - for (UNORDERED_SET<std::string>::iterator it_optdep = mod.optdepends.begin(); + for (std::unordered_set<std::string>::iterator it_optdep = mod.optdepends.begin(); it_optdep != mod.optdepends.end(); ++it_optdep) { std::string optdep = *it_optdep; if (modnames.count(optdep) != 0) |