kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDefinitions: Change LocalKeys to return a vector. 

This is more efficient and we lose nothing.
This commit is contained in:
Stephen Kelly 2015-04-26 16:34:13 +02:00
parent 5067ae41b0
commit 818bf727c1
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmDefinitions.cxx
View File

@ -58,16 +58,17 @@ void cmDefinitions::Erase(const std::string& key)
}
//----------------------------------------------------------------------------
std::set<std::string> cmDefinitions::LocalKeys() const
std::vector<std::string> cmDefinitions::LocalKeys() const
{
std::set<std::string> keys;
std::vector<std::string> keys;
keys.reserve(this->Map.size());
// Consider local definitions.
for(MapType::const_iterator mi = this->Map.begin();
mi != this->Map.end(); ++mi)
{
if (mi->second.Exists)
{
keys.insert(mi->first);
keys.push_back(mi->first);
}
}
return keys;

2
Source/cmDefinitions.h
View File

@ -43,7 +43,7 @@ public:
void Erase(const std::string& key);
/** Get the set of all local keys. */
std::set<std::string> LocalKeys() const;
std::vector<std::string> LocalKeys() const;
/** Compute the closure of all defined keys with values.
This flattens the scope. The result has no parent. */

10
Source/cmMakefile.cxx
View File

@ -89,7 +89,7 @@ public:
}
}
std::set<std::string> LocalKeys() const
std::vector<std::string> LocalKeys() const
{
return this->VarStack.top().LocalKeys();
}
@ -1901,8 +1901,8 @@ void cmMakefile::CheckForUnusedVariables() const
{
return;
}
const std::set<std::string>& locals = this->Internal->LocalKeys();
std::set<std::string>::const_iterator it = locals.begin();
const std::vector<std::string>& locals = this->Internal->LocalKeys();
std::vector<std::string>::const_iterator it = locals.begin();
for (; it != locals.end(); ++it)
{
this->CheckForUnused("out of scope", *it);
@ -4431,10 +4431,10 @@ void cmMakefile::PopScope()
std::set<std::string> init = this->Internal->VarInitStack.top();
std::set<std::string> usage = this->Internal->VarUsageStack.top();
const std::set<std::string>& locals = this->Internal->LocalKeys();
const std::vector<std::string>& locals = this->Internal->LocalKeys();
// Remove initialization and usage information for variables in the local
// scope.
std::set<std::string>::const_iterator it = locals.begin();
std::vector<std::string>::const_iterator it = locals.begin();
for (; it != locals.end(); ++it)
{
init.erase(*it);