games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-13 01:20:34 +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

14
lib/CDefObjInfoHandler.cpp
View File

@ -18,9 +18,9 @@
bool CGDefInfo::isVisitable() const
{
for (int i=0; i<6; i++)
for (auto & elem : visitMap)
{
if (visitMap[i])
if (elem)
return true;
}
return false;
@ -58,7 +58,7 @@ CDefObjInfoHandler::CDefObjInfoHandler()
std::string mapStr;
for(int hh=0; hh<objNumber; ++hh)
{
CGDefInfo* nobj = new CGDefInfo();
auto nobj = new CGDefInfo();
std::string dump;
inp>>nobj->name;
@ -120,9 +120,9 @@ CDefObjInfoHandler::CDefObjInfoHandler()
Obj::QUEST_GUARD,
Obj::CORPSE};
for(int i=0; i < ARRAY_COUNT(visitableFromTop); i++)
for(auto & elem : visitableFromTop)
{
if(visitableFromTop[i] == nobj->id)
if(elem == nobj->id)
{
nobj->visitDir = 0xff;
break;
@ -163,7 +163,7 @@ CDefObjInfoHandler::CDefObjInfoHandler()
CDefObjInfoHandler::~CDefObjInfoHandler()
{
for(bmap<int,bmap<int, ConstTransitivePtr<CGDefInfo> > >::iterator i=gobjs.begin(); i!=gobjs.end(); i++)
for(bmap<int, ConstTransitivePtr<CGDefInfo> >::iterator j=i->second.begin(); j!=i->second.end(); j++)
for(auto & elem : gobjs)
for(auto j=elem.second.begin(); j!=elem.second.end(); j++)
j->second.dellNull();
}