summaryrefslogtreecommitdiffstats
path: root/src/build.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-13 21:03:16 (GMT)
committerBrad King <brad.king@kitware.com>2017-06-19 15:08:26 (GMT)
commit721d2a26b629d8556b73ce051f982967428d0738 (patch)
tree7ab9435ab98f5122d72dd1595a8934e633e9747c /src/build.h
parentb6f020d3640988824b1fe4355996ef0726a2c44c (diff)
downloadNinja-721d2a26b629d8556b73ce051f982967428d0738.zip
Ninja-721d2a26b629d8556b73ce051f982967428d0738.tar.gz
Ninja-721d2a26b629d8556b73ce051f982967428d0738.tar.bz2
Drop unnecessary cycle detection in Plan::AddTarget
We now detect and reject cycles in DependencyScan::RecomputeDirty before Plan::AddTarget is called so we can assume DAG input to the Plan.
Diffstat (limited to 'src/build.h')
-rw-r--r--src/build.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/build.h b/src/build.h
index f97d67e..43786f1 100644
--- a/src/build.h
+++ b/src/build.h
@@ -75,9 +75,7 @@ struct Plan {
void Reset();
private:
- bool AddSubTarget(Node* node, vector<Node*>* stack, string* err);
- bool CheckDependencyCycle(Node* node, const vector<Node*>& stack,
- string* err);
+ bool AddSubTarget(Node* node, Node* dependent, string* err);
void NodeFinished(Node* node);
/// Submits a ready edge as a candidate for execution.