mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-10 02:19:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmDefinitions: Implement MakeClosure in terms of reverse iterators.

Browse Source 
Iterate directly over the parent content provided by cmMakefile.
This commit is contained in:
Stephen Kelly
2015-04-29 23:48:43 +02:00
parent aa4d1ee80f
commit f79cd99d6d
3 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmDefinitions.cxx
View File

@@ -76,27 +76,27 @@ std::vector<std::string> cmDefinitions::LocalKeys() const
//----------------------------------------------------------------------------
cmDefinitions cmDefinitions::MakeClosure(
std::list<cmDefinitions const*>::iterator begin,
std::list<cmDefinitions const*>::iterator end)
std::list<cmDefinitions>::const_reverse_iterator rbegin,
std::list<cmDefinitions>::const_reverse_iterator rend)
{
std::set<std::string> undefined;
cmDefinitions closure;
closure.MakeClosure(undefined, begin, end);
closure.MakeClosure(undefined, rbegin, rend);
return closure;
}
//----------------------------------------------------------------------------
void
cmDefinitions::MakeClosure(std::set<std::string>& undefined,
std::list<cmDefinitions const*>::iterator begin,
std::list<cmDefinitions const*>::iterator end)
std::list<cmDefinitions>::const_reverse_iterator rbegin,
std::list<cmDefinitions>::const_reverse_iterator rend)
{
for (std::list<cmDefinitions const*>::const_iterator it = begin;
it != end; ++it)
for (std::list<cmDefinitions>::const_reverse_iterator it = rbegin;
it != rend; ++it)
{
// Consider local definitions.
for(MapType::const_iterator mi = (*it)->Map.begin();
mi != (*it)->Map.end(); ++mi)
for(MapType::const_iterator mi = it->Map.begin();
mi != it->Map.end(); ++mi)
{
// Use this key if it is not already set or unset.
if(this->Map.find(mi->first) == this->Map.end() &&