diff options
| author | Brad King <brad.king@kitware.com> | 2009-01-20 19:36:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-01-20 19:36:18 (GMT) |
| commit | 2c81e5fb5cd592e9450250364e6667082014f0b7 (patch) | |
| tree | 8897bcaca936aaedba35f3153f976b315b912329 /Source/cmIfCommand.h | |
| parent | a541cac325715cd50f604ede864eba8edfbb2673 (diff) | |
| download | CMake-2c81e5fb5cd592e9450250364e6667082014f0b7.zip CMake-2c81e5fb5cd592e9450250364e6667082014f0b7.tar.gz CMake-2c81e5fb5cd592e9450250364e6667082014f0b7.tar.bz2 | |
ENH: Refactor function blocker deletion
When a function blocker decides to remove itself we previously removed
it at every return point from the C++ scope in which its removal is
needed. This teaches function blockers to transfer ownership of
themselves from cmMakefile to an automatic variable for deletion on
return. Since this removes blockers before they replay their commands,
we no longer need to avoid running blockers on their own commands.
Diffstat (limited to 'Source/cmIfCommand.h')
| -rw-r--r-- | Source/cmIfCommand.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmIfCommand.h b/Source/cmIfCommand.h index bc84e56..0d2802a 100644 --- a/Source/cmIfCommand.h +++ b/Source/cmIfCommand.h @@ -29,7 +29,7 @@ class cmIfFunctionBlocker : public cmFunctionBlocker { public: cmIfFunctionBlocker() { - this->HasRun = false; this->ScopeDepth = 0; this->Executing = false;} + this->HasRun = false; this->ScopeDepth = 0; } virtual ~cmIfFunctionBlocker() {} virtual bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf, @@ -43,7 +43,6 @@ public: bool IsBlocking; bool HasRun; unsigned int ScopeDepth; - bool Executing; }; /** \class cmIfCommand |