diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-04-26 14:13:56 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-04-29 21:54:17 (GMT) |
commit | aa4d1ee80f1ced5b09335cc84bdd373c0875fd80 (patch) | |
tree | 17b4cc2a21e72453fa93439e3497c18fca0624c3 /Source/cmMakefile.cxx | |
parent | 60becdc65c5f8cfad4b2c6a33e3649d2acbddf39 (diff) | |
download | CMake-aa4d1ee80f1ced5b09335cc84bdd373c0875fd80.zip CMake-aa4d1ee80f1ced5b09335cc84bdd373c0875fd80.tar.gz CMake-aa4d1ee80f1ced5b09335cc84bdd373c0875fd80.tar.bz2 |
cmDefinitions: Convert MakeClosure into a static method.
Accept a range of cmDefinitions*.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r-- | Source/cmMakefile.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 8cfb83a..8797090 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -63,7 +63,15 @@ public: void InitializeDefinitions(cmMakefile* parent) { - this->VarStack.back() = parent->Internal->VarStack.back().MakeClosure(); + std::list<cmDefinitions const*> defPtrs; + for (std::list<cmDefinitions>::iterator it = + parent->Internal->VarStack.begin(); + it != parent->Internal->VarStack.end(); ++it) + { + defPtrs.push_back(&*it); + } + this->VarStack.back() = cmDefinitions::MakeClosure(defPtrs.begin(), + defPtrs.end()); } const char* GetDefinition(std::string const& name) |