diff options
| author | Regina Pfeifer <regina@mailbox.org> | 2019-08-06 08:05:27 (GMT) |
|---|---|---|
| committer | Regina Pfeifer <regina@mailbox.org> | 2019-08-06 08:05:27 (GMT) |
| commit | 5558070d5265c9a8c15efb64787eaadbd3adb60f (patch) | |
| tree | be8aa5d867308866191000701782a00082f73d39 /Source | |
| parent | 2327cc0e0575175e8dec4b7a6fa6cafd5d0f7ca9 (diff) | |
| download | CMake-5558070d5265c9a8c15efb64787eaadbd3adb60f.zip CMake-5558070d5265c9a8c15efb64787eaadbd3adb60f.tar.gz CMake-5558070d5265c9a8c15efb64787eaadbd3adb60f.tar.bz2 | |
cmExecutionStatus: Remove function Clear
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExecutionStatus.h | 9 | ||||
| -rw-r--r-- | Source/cmForEachCommand.cxx | 3 | ||||
| -rw-r--r-- | Source/cmIfCommand.cxx | 3 |
3 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h index bcacc2f..654922c 100644 --- a/Source/cmExecutionStatus.h +++ b/Source/cmExecutionStatus.h @@ -22,15 +22,6 @@ public: { } - void Clear() - { - this->Error = "unknown error."; - this->ReturnInvoked = false; - this->BreakInvoked = false; - this->ContinueInvoked = false; - this->NestedError = false; - } - cmMakefile& GetMakefile() { return this->Makefile; } void SetError(std::string const& e) { this->Error = e; } diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx index 1d961be..a565786 100644 --- a/Source/cmForEachCommand.cxx +++ b/Source/cmForEachCommand.cxx @@ -74,9 +74,8 @@ bool cmForEachFunctionBlocker::Replay( // set the variable to the loop value mf.AddDefinition(this->Args[0], arg); // Invoke all the functions that were collected in the block. - cmExecutionStatus status(mf); for (cmListFileFunction const& func : functions) { - status.Clear(); + cmExecutionStatus status(mf); mf.ExecuteCommand(func, status); if (status.GetReturnInvoked()) { inStatus.SetReturnInvoked(); diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx index c5cfd8c..7b49ae7 100644 --- a/Source/cmIfCommand.cxx +++ b/Source/cmIfCommand.cxx @@ -61,7 +61,6 @@ bool cmIfFunctionBlocker::Replay(std::vector<cmListFileFunction> functions, { cmMakefile& mf = inStatus.GetMakefile(); // execute the functions for the true parts of the if statement - cmExecutionStatus status(mf); int scopeDepth = 0; for (cmListFileFunction const& func : functions) { // keep track of scope depth @@ -147,7 +146,7 @@ bool cmIfFunctionBlocker::Replay(std::vector<cmListFileFunction> functions, // should we execute? else if (!this->IsBlocking) { - status.Clear(); + cmExecutionStatus status(mf); mf.ExecuteCommand(func, status); if (status.GetReturnInvoked()) { inStatus.SetReturnInvoked(); |