diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-22 15:46:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-22 15:46:00 (GMT) |
| commit | a38c2711e9110b5b8d8122cdf1aaf25d65f5ea3b (patch) | |
| tree | f13d7a9c8356b510762a41d7893acb1bcab0090f /Source/cmWhileCommand.h | |
| parent | b3de2a8e6451c9138948c23a974740823ade8263 (diff) | |
| parent | 5d85fb4f407cd661fb904f68e2c9cc27ddcc0331 (diff) | |
| download | CMake-a38c2711e9110b5b8d8122cdf1aaf25d65f5ea3b.zip CMake-a38c2711e9110b5b8d8122cdf1aaf25d65f5ea3b.tar.gz CMake-a38c2711e9110b5b8d8122cdf1aaf25d65f5ea3b.tar.bz2 | |
Merge branch 'fix-function-missing-end' into release-3.2
Diffstat (limited to 'Source/cmWhileCommand.h')
| -rw-r--r-- | Source/cmWhileCommand.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmWhileCommand.h b/Source/cmWhileCommand.h index 9fafffc..85a0bd3 100644 --- a/Source/cmWhileCommand.h +++ b/Source/cmWhileCommand.h @@ -19,8 +19,8 @@ class cmWhileFunctionBlocker : public cmFunctionBlocker { public: - cmWhileFunctionBlocker() {this->Depth=0;} - virtual ~cmWhileFunctionBlocker() {} + cmWhileFunctionBlocker(cmMakefile* mf); + ~cmWhileFunctionBlocker(); virtual bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, cmExecutionStatus &); @@ -29,6 +29,7 @@ public: std::vector<cmListFileArgument> Args; std::vector<cmListFileFunction> Functions; private: + cmMakefile* Makefile; int Depth; }; |
