summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-06 10:30:21 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-04-06 15:58:54 (GMT)
commitcec8f97e5717fac279d310f3f0b9e849a0e59706 (patch)
treed5306d883c146c3f660e104ab26189b047125d0e
parent9b7213dc47d2477cb4ceb5032a9078412b5474bd (diff)
downloadCMake-cec8f97e5717fac279d310f3f0b9e849a0e59706.zip
CMake-cec8f97e5717fac279d310f3f0b9e849a0e59706.tar.gz
CMake-cec8f97e5717fac279d310f3f0b9e849a0e59706.tar.bz2
cmMakefile: Simplify GetDefinitions implementation.
-rw-r--r--Source/cmMakefile.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 215ee16..7f44da2 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2501,20 +2501,20 @@ const char* cmMakefile::GetSafeDefinition(const std::string& def) const
std::vector<std::string> cmMakefile
::GetDefinitions(int cacheonly /* = 0 */) const
{
- std::set<std::string> definitions;
+ std::vector<std::string> res;
if ( !cacheonly )
{
- definitions = this->Internal->VarStack.top().ClosureKeys();
+ std::set<std::string> definitions =
+ this->Internal->VarStack.top().ClosureKeys();
+ res.insert(res.end(), definitions.begin(), definitions.end());
}
cmCacheManager::CacheIterator cit =
this->GetCacheManager()->GetCacheIterator();
for ( cit.Begin(); !cit.IsAtEnd(); cit.Next() )
{
- definitions.insert(cit.GetName());
+ res.push_back(cit.GetName());
}
-
- std::vector<std::string> res;
- res.insert(res.end(), definitions.begin(), definitions.end());
+ std::sort(res.begin(), res.end());
return res;
}