summaryrefslogtreecommitdiffstats
path: root/Source/cmFunctionCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-05-19 15:09:21 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-05-19 15:09:21 (GMT)
commitaa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7 (patch)
tree1ba4368530f862529bbd4eec0b298ce28cbdb955 /Source/cmFunctionCommand.cxx
parentdee32a8d0baf23bfb130fbb1dc508adf8688dc32 (diff)
parent3a65606591818281ba75bac4751e07c69751451f (diff)
downloadCMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.zip
CMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.tar.gz
CMake-aa68f2e4c9bbaf49812eb76d357f94ee3da7d6e7.tar.bz2
Merge topic 'fix-function-missing-endforeach'
3a656065 Fix assertion failure on unmatched foreach in function (#15572)
Diffstat (limited to 'Source/cmFunctionCommand.cxx')
-rw-r--r--Source/cmFunctionCommand.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index fdd1018..001adb1 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