diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-29 09:58:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-29 09:58:25 (GMT) |
| commit | 39677de5e209445c8cbc5957c1e79088d5d2a03a (patch) | |
| tree | 899f1c5fb22cc2dffc81758b1654964faecee3ac /Source/cmConditionEvaluator.h | |
| parent | 1382002ae2e78ea8bcda7f97be9130246ea40b11 (diff) | |
| parent | 07c1bdda3d42b255ddf9d7145e0aa952f87ee978 (diff) | |
| download | CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.zip CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.tar.gz CMake-39677de5e209445c8cbc5957c1e79088d5d2a03a.tar.bz2 | |
Merge topic 'simplify-execution-context'
07c1bdda3d cmMakefile: Replace GetExecutionFilePath with the top of the Backtrace
727ed0c403 cmMakefile: Simplify ExpandArguments signature
e456dae669 cmConditionEvaluator: Remove extra copy of execution context
0100a4943e cmMakefile: Remove now-unused overload of GetBacktrace
dc49abcb89 if,while: Clarify condition backtrace construction
68af831505 cmMakefile: Inline GetExecutionContext at call sites
280f3918f3 cmMakefile: Simplify GetExecutionContext implementation
0e59b45dfc cmListFileCache: Add explicit constructors
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5276
Diffstat (limited to 'Source/cmConditionEvaluator.h')
| -rw-r--r-- | Source/cmConditionEvaluator.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Source/cmConditionEvaluator.h b/Source/cmConditionEvaluator.h index a4cedff..cf00ede 100644 --- a/Source/cmConditionEvaluator.h +++ b/Source/cmConditionEvaluator.h @@ -21,8 +21,7 @@ class cmConditionEvaluator public: using cmArgumentList = std::list<cmExpandedCommandArgument>; - cmConditionEvaluator(cmMakefile& makefile, cmListFileContext context, - cmListFileBacktrace bt); + cmConditionEvaluator(cmMakefile& makefile, cmListFileBacktrace bt); // this is a shared function for both If and Else to determine if the // arguments were valid, and if so, was the response true. If there is @@ -79,7 +78,6 @@ private: MessageType& status); cmMakefile& Makefile; - cmListFileContext ExecutionContext; cmListFileBacktrace Backtrace; cmPolicies::PolicyStatus Policy12Status; cmPolicies::PolicyStatus Policy54Status; |