Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
5558070d
Commit
5558070d
authored
Aug 06, 2019
by
wahikihiki
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmExecutionStatus: Remove function Clear
parent
2327cc0e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
13 deletions
+2
-13
Source/cmExecutionStatus.h
Source/cmExecutionStatus.h
+0
-9
Source/cmForEachCommand.cxx
Source/cmForEachCommand.cxx
+1
-2
Source/cmIfCommand.cxx
Source/cmIfCommand.cxx
+1
-2
No files found.
Source/cmExecutionStatus.h
View file @
5558070d
...
...
@@ -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
;
}
...
...
Source/cmForEachCommand.cxx
View file @
5558070d
...
...
@@ -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
();
...
...
Source/cmIfCommand.cxx
View file @
5558070d
...
...
@@ -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
();
...
...
Brad King
@brad.king
mentioned in commit
8bd5e5f1
·
Aug 09, 2019
mentioned in commit
8bd5e5f1
mentioned in commit 8bd5e5f181f2f458681dd1435f96b180c3b095dc
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment