games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

second part of c++11 update. gcc 4.5 and VS 2010 are no longer supported

Browse Source 
- BOOST_FOREACH -> for
- replaced several boost classes with std (e.g. unordered)
- removed gcc-4.5 workarounds
- ran clang c++11 migration tool to detect some cases:
- - pointer initialized with "0" to nullptr
- - replace for with iterators with range-based for
- - use auto in some situations (type name specified twice, avoid long iterators type names)
This commit is contained in:
Ivan Savenko
2013-06-29 13:05:48 +00:00
parent 262f956a16
commit f82122d9be
88 changed files with 2065 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/mapping/CCampaignHandler.cpp
View File

@@ -330,7 +330,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
if (!(travelOptions.whatHeroKeeps & 1))
{
//trimming experience
BOOST_FOREACH(CGHeroInstance * cgh, crossoverHeroes)
for(CGHeroInstance * cgh : crossoverHeroes)
{
cgh->initExp();
}
@@ -338,7 +338,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
if (!(travelOptions.whatHeroKeeps & 2))
{
//trimming prim skills
BOOST_FOREACH(CGHeroInstance * cgh, crossoverHeroes)
for(CGHeroInstance * cgh : crossoverHeroes)
{
for(int g=0; g<GameConstants::PRIMARY_SKILLS; ++g)
{
@@ -351,7 +351,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
if (!(travelOptions.whatHeroKeeps & 4))
{
//trimming sec skills
BOOST_FOREACH(CGHeroInstance * cgh, crossoverHeroes)
for(CGHeroInstance * cgh : crossoverHeroes)
{
cgh->secSkills = cgh->type->secSkillsInit;
}
@@ -359,7 +359,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
if (!(travelOptions.whatHeroKeeps & 8))
{
//trimming spells
BOOST_FOREACH(CGHeroInstance * cgh, crossoverHeroes)
for(CGHeroInstance * cgh : crossoverHeroes)
{
cgh->spells.clear();
}
@@ -367,7 +367,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
if (!(travelOptions.whatHeroKeeps & 16))
{
//trimming artifacts
BOOST_FOREACH(CGHeroInstance * hero, crossoverHeroes)
for(CGHeroInstance * hero : crossoverHeroes)
{
size_t totalArts = GameConstants::BACKPACK_START + hero->artifactsInBackpack.size();
for (size_t i=0; i<totalArts; i++ )
@@ -391,7 +391,7 @@ void CCampaignScenario::prepareCrossoverHeroes( std::vector<CGHeroInstance *> he
}
//trimming creatures
BOOST_FOREACH(CGHeroInstance * cgh, crossoverHeroes)
for(CGHeroInstance * cgh : crossoverHeroes)
{
vstd::erase_if(cgh->stacks, [&](const std::pair<SlotID, CStackInstance *> & j) -> bool
{