diff options
author | Jan Niklas Hasse <jhasse@bixense.com> | 2020-12-03 09:55:34 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-03 09:55:34 (GMT) |
commit | 7193fb7c1e63bbb88e9658c23152fc20387d50e7 (patch) | |
tree | a935d6744728035c4e567ab9b19e26a97080adab /src | |
parent | 7cff4770b553e8a1a1eab9aefe093c6b95bdebb4 (diff) | |
parent | 76ecd305411e6fe942ee4efc5cc098b5c5c79d96 (diff) | |
download | Ninja-7193fb7c1e63bbb88e9658c23152fc20387d50e7.zip Ninja-7193fb7c1e63bbb88e9658c23152fc20387d50e7.tar.gz Ninja-7193fb7c1e63bbb88e9658c23152fc20387d50e7.tar.bz2 |
Merge pull request #1792 from neheb/dec
[clang-tidy] fix inconsistent declarations
Diffstat (limited to 'src')
-rw-r--r-- | src/build.cc | 12 | ||||
-rw-r--r-- | src/build.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/build.cc b/src/build.cc index 2fb2aa4..d08535d 100644 --- a/src/build.cc +++ b/src/build.cc @@ -318,8 +318,8 @@ void Plan::Reset() { want_.clear(); } -bool Plan::AddTarget(const Node* node, string* err) { - return AddSubTarget(node, NULL, err, NULL); +bool Plan::AddTarget(const Node* target, string* err) { + return AddSubTarget(target, NULL, err, NULL); } bool Plan::AddSubTarget(const Node* node, const Node* dependent, string* err, @@ -782,16 +782,16 @@ Node* Builder::AddTarget(const string& name, string* err) { return node; } -bool Builder::AddTarget(Node* node, string* err) { - if (!scan_.RecomputeDirty(node, err)) +bool Builder::AddTarget(Node* target, string* err) { + if (!scan_.RecomputeDirty(target, err)) return false; - if (Edge* in_edge = node->in_edge()) { + if (Edge* in_edge = target->in_edge()) { if (in_edge->outputs_ready()) return true; // Nothing to do. } - if (!plan_.AddTarget(node, err)) + if (!plan_.AddTarget(target, err)) return false; return true; diff --git a/src/build.h b/src/build.h index 2798693..fd6b6f6 100644 --- a/src/build.h +++ b/src/build.h @@ -46,7 +46,7 @@ struct Plan { /// Add a target to our plan (including all its dependencies). /// Returns false if we don't need to build this target; may /// fill in |err| with an error message if there's a problem. - bool AddTarget(const Node* node, std::string* err); + bool AddTarget(const Node* target, std::string* err); // Pop a ready edge off the queue of edges to build. // Returns NULL if there's no work to do. |