mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-02-16 11:39:39 +00:00
Replace boost::array with c++11
This commit is contained in:
parent
b2a1c940b0
commit
fc17e47ecb
5 changed files with 8 additions and 8 deletions
apps/openmw/mwgui
components/esm
|
@ -535,7 +535,7 @@ namespace MWGui
|
|||
{
|
||||
if (mGenerateClassStep == 10)
|
||||
{
|
||||
static boost::array<ClassPoint, 23> classes = { {
|
||||
static std::array<ClassPoint, 23> classes = { {
|
||||
{"Acrobat", {6, 2, 2}},
|
||||
{"Agent", {6, 1, 3}},
|
||||
{"Archer", {3, 5, 2}},
|
||||
|
|
|
@ -202,9 +202,9 @@ namespace MWGui
|
|||
std::set<int> 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<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
|
||||
std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
|
||||
mMiscSkills.clear();
|
||||
for (boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
|
||||
for (std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
|
||||
{
|
||||
int skill = *it;
|
||||
if (skillSet.find(skill) == skillSet.end())
|
||||
|
|
|
@ -215,9 +215,9 @@ namespace MWGui
|
|||
std::set<int> 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<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
|
||||
std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator end = ESM::Skill::sSkillIds.end();
|
||||
mMiscSkills.clear();
|
||||
for (boost::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
|
||||
for (std::array<ESM::Skill::SkillEnum, ESM::Skill::Length>::const_iterator it = ESM::Skill::sSkillIds.begin(); it != end; ++it)
|
||||
{
|
||||
int skill = *it;
|
||||
if (skillSet.find(skill) == skillSet.end())
|
||||
|
|
|
@ -97,7 +97,7 @@ namespace ESM
|
|||
"stealth_speechcraft.dds",
|
||||
"stealth_handtohand.dds",
|
||||
};
|
||||
const boost::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds = {{
|
||||
const std::array<Skill::SkillEnum, Skill::Length> Skill::sSkillIds = {{
|
||||
Block,
|
||||
Armorer,
|
||||
MediumArmor,
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
#include <boost/array.hpp>
|
||||
#include <array>
|
||||
|
||||
#include "defs.hpp"
|
||||
|
||||
|
@ -76,7 +76,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<SkillEnum, Length> sSkillIds;
|
||||
static const std::array<SkillEnum, Length> sSkillIds;
|
||||
|
||||
void load(ESMReader &esm);
|
||||
void save(ESMWriter &esm) const;
|
||||
|
|
Loading…
Reference in a new issue