diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-18 15:16:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-05-18 15:16:36 (GMT) |
| commit | 07db2ca3c6f85af628841d12b50a8c0df13ffee8 (patch) | |
| tree | 14d4dcec48077c703ff64ef11aafb8c6b7d541f6 /Source | |
| parent | 9c3b9d1a27924602ba7ae9c0dde591414d8f892c (diff) | |
| parent | 3a65606591818281ba75bac4751e07c69751451f (diff) | |
| download | CMake-07db2ca3c6f85af628841d12b50a8c0df13ffee8.zip CMake-07db2ca3c6f85af628841d12b50a8c0df13ffee8.tar.gz CMake-07db2ca3c6f85af628841d12b50a8c0df13ffee8.tar.bz2 | |
Merge branch 'fix-function-missing-endforeach' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmFunctionCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx index c33048c..4a0efc1 100644 --- a/Source/cmFunctionCommand.cxx +++ b/Source/cmFunctionCommand.cxx @@ -94,8 +94,8 @@ bool cmFunctionHelperCommand::InvokeInitialPass } // we push a scope on the makefile - cmMakefile::LexicalPushPop lexScope(this->Makefile); cmMakefile::ScopePushPop varScope(this->Makefile); + cmMakefile::LexicalPushPop lexScope(this->Makefile); static_cast<void>(varScope); // Push a weak policy scope which restores the policies recorded at diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index ba914e1..61a175c 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3284,6 +3284,7 @@ void cmMakefile::PopFunctionBlockerBarrier(bool reportError) this->FunctionBlockerBarriers.back(); while(this->FunctionBlockers.size() > barrier) { + cmMakefile::LoopBlockPop loopBlockPop(this); cmsys::auto_ptr<cmFunctionBlocker> fb(this->FunctionBlockers.back()); this->FunctionBlockers.pop_back(); if(reportError) |