From 5558070d5265c9a8c15efb64787eaadbd3adb60f Mon Sep 17 00:00:00 2001 From: Regina Pfeifer Date: Tue, 6 Aug 2019 10:05:27 +0200 Subject: cmExecutionStatus: Remove function Clear --- Source/cmExecutionStatus.h | 9 --------- Source/cmForEachCommand.cxx | 3 +-- 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 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 functions, // should we execute? else if (!this->IsBlocking) { - status.Clear(); + cmExecutionStatus status(mf); mf.ExecuteCommand(func, status); if (status.GetReturnInvoked()) { inStatus.SetReturnInvoked(); -- cgit v0.12