summaryrefslogtreecommitdiffstats
path: root/src/graph.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-03-07 19:25:10 (GMT)
committerEvan Martin <martine@danga.com>2011-03-07 19:25:54 (GMT)
commit15d4695878749c3525c96e856ef08dfb19a2c3e5 (patch)
treed5829403a867eb44e1e7ec957ab77fcf2ad707c8 /src/graph.cc
parenta5980c6bb2d6ccb6ffed2d92304c55ba94622963 (diff)
downloadNinja-15d4695878749c3525c96e856ef08dfb19a2c3e5.zip
Ninja-15d4695878749c3525c96e856ef08dfb19a2c3e5.tar.gz
Ninja-15d4695878749c3525c96e856ef08dfb19a2c3e5.tar.bz2
files that have both implicit and explicit edges should be implicit
This is just deleting some code that was written in anticipation of staying memory-resident; when loading a depfile, we don't need to attempt to update existing entries in the dependency list, we just need to blindly add them.
Diffstat (limited to 'src/graph.cc')
-rw-r--r--src/graph.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/graph.cc b/src/graph.cc
index bdbcf3b..35ae088 100644
--- a/src/graph.cc
+++ b/src/graph.cc
@@ -213,17 +213,9 @@ bool Edge::LoadDepFile(State* state, DiskInterface* disk_interface,
return false;
Node* node = state->GetNode(*i);
- for (vector<Node*>::iterator j = inputs_.begin(); j != inputs_.end(); ++j) {
- if (*j == node) {
- node = NULL;
- break;
- }
- }
- if (node) {
- inputs_.insert(inputs_.end() - order_only_deps_, node);
- node->out_edges_.push_back(this);
- ++implicit_deps_;
- }
+ inputs_.insert(inputs_.end() - order_only_deps_, node);
+ node->out_edges_.push_back(this);
+ ++implicit_deps_;
}
return true;