summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-23 13:08:18 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-06-23 13:08:18 (GMT)
commit5ab7dd544e2d10bf6b05ab046a852b84eee63126 (patch)
tree4510d75270473d5a30865c4afdfabefa8584bcfd /Source/cmMakefile.cxx
parentbddfe77d12ee7d6ecaa3c4fa8ade1c4c0cab5760 (diff)
parent5d85fb4f407cd661fb904f68e2c9cc27ddcc0331 (diff)
downloadCMake-5ab7dd544e2d10bf6b05ab046a852b84eee63126.zip
CMake-5ab7dd544e2d10bf6b05ab046a852b84eee63126.tar.gz
CMake-5ab7dd544e2d10bf6b05ab046a852b84eee63126.tar.bz2
Merge topic 'fix-function-missing-end'
5d85fb4f Fix assertion failure on unmatched function or macro
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 40c3885..a3ba134 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3279,7 +3279,6 @@ 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)