diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp index e3effa995..0d3db87b7 100644 --- a/apps/openmw/mwgui/charactercreation.cpp +++ b/apps/openmw/mwgui/charactercreation.cpp @@ -554,7 +554,7 @@ namespace MWGui { if (mGenerateClassStep == 10) { - static boost::array classes = { { + static std::array classes = { { {"Acrobat", {6, 2, 2}}, {"Agent", {6, 1, 3}}, {"Archer", {3, 5, 2}}, diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 004a172b3..fb8b48a61 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/apps/openmw/mwgui/review.cpp @@ -228,11 +228,9 @@ namespace MWGui std::set skillSet; std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin())); std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin())); - boost::array::const_iterator end = ESM::Skill::sSkillIds.end(); mMiscSkills.clear(); - for (boost::array::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it) + for (const int skill : ESM::Skill::sSkillIds) { - int skill = *it; if (skillSet.find(skill) == skillSet.end()) mMiscSkills.push_back(skill); } diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index df292cfaa..862660fc7 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -278,11 +278,9 @@ namespace MWGui std::set skillSet; std::copy(major.begin(), major.end(), std::inserter(skillSet, skillSet.begin())); std::copy(minor.begin(), minor.end(), std::inserter(skillSet, skillSet.begin())); - boost::array::const_iterator end = ESM::Skill::sSkillIds.end(); mMiscSkills.clear(); - for (boost::array::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it) + for (const int skill : ESM::Skill::sSkillIds) { - int skill = *it; if (skillSet.find(skill) == skillSet.end()) mMiscSkills.push_back(skill); } diff --git a/components/esm/loadskil.cpp b/components/esm/loadskil.cpp index 36204c940..e77c2def0 100644 --- a/components/esm/loadskil.cpp +++ b/components/esm/loadskil.cpp @@ -97,7 +97,7 @@ namespace ESM "stealth_speechcraft.dds", "stealth_handtohand.dds", }; - const boost::array Skill::sSkillIds = {{ + const std::array Skill::sSkillIds = {{ Block, Armorer, MediumArmor, diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp index 5430b422d..099264fab 100644 --- a/components/esm/loadskil.hpp +++ b/components/esm/loadskil.hpp @@ -1,10 +1,9 @@ #ifndef OPENMW_ESM_SKIL_H #define OPENMW_ESM_SKIL_H +#include #include -#include - #include "defs.hpp" namespace ESM { @@ -76,7 +75,7 @@ struct Skill static const std::string sSkillNames[Length]; static const std::string sSkillNameIds[Length]; static const std::string sIconNames[Length]; - static const boost::array sSkillIds; + static const std::array sSkillIds; void load(ESMReader &esm, bool &isDeleted); void save(ESMWriter &esm, bool isDeleted = false) const;