From a98baef5e4fedca36c8c8755ad7c8233469f6a3f Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sun, 4 Jun 2017 21:00:04 +0200 Subject: C++11 patchset 2: remove util/cpp11.h and util/cpp11_container.h (#5821) --- src/mods.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/mods.cpp') 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::iterator dep_it = mod.unsatisfied_depends.begin(); + for (std::unordered_set::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::const_iterator it = m_name_conflicts.begin(); - it != m_name_conflicts.end(); ++it) { + for (std::unordered_set::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::iterator it_optdep = mod.optdepends.begin(); + for (std::unordered_set::iterator it_optdep = mod.optdepends.begin(); it_optdep != mod.optdepends.end(); ++it_optdep) { std::string optdep = *it_optdep; if (modnames.count(optdep) != 0) -- cgit v1.2.3