diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-19 15:09:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-19 15:09:28 (GMT) |
| commit | 2d1d8af9b19e1cb361b07a914bc8b87a2a352e2e (patch) | |
| tree | f569ceea9b175fc7211d36c8e85842b8524f08a8 /Source/cmMakefile.cxx | |
| parent | 43aa5c6ca1da49dc19c225c5bc5b276f277a1dee (diff) | |
| parent | f170985e7aaec7562ca481bab49228ece233c4e4 (diff) | |
| download | CMake-2d1d8af9b19e1cb361b07a914bc8b87a2a352e2e.zip CMake-2d1d8af9b19e1cb361b07a914bc8b87a2a352e2e.tar.gz CMake-2d1d8af9b19e1cb361b07a914bc8b87a2a352e2e.tar.bz2 | |
Merge topic 'clean-up-cmDefinitions'
f170985e cmDefinitions: Make the ClosureKeys method static.
98c5c903 cmDefinitions: Centralize knowledge of iterator type.
7872201b cmDefinitions: Remove internal MakeClosure method.
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 620a1d6..051becd 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -94,16 +94,8 @@ public: std::vector<std::string> ClosureKeys() const { - std::vector<std::string> closureKeys; - std::set<std::string> bound; - for (std::list<cmDefinitions>::const_reverse_iterator it = - this->VarStack.rbegin(); it != this->VarStack.rend(); ++it) - { - std::vector<std::string> const& localKeys = it->ClosureKeys(bound); - closureKeys.insert(closureKeys.end(), - localKeys.begin(), localKeys.end()); - } - return closureKeys; + return cmDefinitions::ClosureKeys(this->VarStack.rbegin(), + this->VarStack.rend()); } void PopDefinitions() |