diff options
author | Nico Weber <nicolasweber@gmx.de> | 2017-09-04 02:15:13 (GMT) |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2017-09-04 02:15:13 (GMT) |
commit | 0c671527322d15016bb9ff5c3cf436f68e6ddbde (patch) | |
tree | cf9625c31e7ad023606c3881c6c759c8572c45c9 /src/state.cc | |
parent | 256bf897b85e35bc90294090ad39b5214eb141fb (diff) | |
parent | b98941a605d3cc47966d8407ace6e454d781af9b (diff) | |
download | Ninja-1.8.0.zip Ninja-1.8.0.tar.gz Ninja-1.8.0.tar.bz2 |
v1.8.0v1.8.0
Diffstat (limited to 'src/state.cc')
-rw-r--r-- | src/state.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/state.cc b/src/state.cc index d539e7b..9b3c7e1 100644 --- a/src/state.cc +++ b/src/state.cc @@ -100,7 +100,7 @@ Edge* State::AddEdge(const Rule* rule) { return edge; } -Node* State::GetNode(StringPiece path, unsigned int slash_bits) { +Node* State::GetNode(StringPiece path, uint64_t slash_bits) { Node* node = LookupNode(path); if (node) return node; @@ -134,13 +134,13 @@ Node* State::SpellcheckNode(const string& path) { return result; } -void State::AddIn(Edge* edge, StringPiece path, unsigned int slash_bits) { +void State::AddIn(Edge* edge, StringPiece path, uint64_t slash_bits) { Node* node = GetNode(path, slash_bits); edge->inputs_.push_back(node); node->AddOutEdge(edge); } -bool State::AddOut(Edge* edge, StringPiece path, unsigned int slash_bits) { +bool State::AddOut(Edge* edge, StringPiece path, uint64_t slash_bits) { Node* node = GetNode(path, slash_bits); if (node->in_edge()) return false; @@ -184,8 +184,10 @@ vector<Node*> State::DefaultNodes(string* err) const { void State::Reset() { for (Paths::iterator i = paths_.begin(); i != paths_.end(); ++i) i->second->ResetState(); - for (vector<Edge*>::iterator e = edges_.begin(); e != edges_.end(); ++e) + for (vector<Edge*>::iterator e = edges_.begin(); e != edges_.end(); ++e) { (*e)->outputs_ready_ = false; + (*e)->mark_ = Edge::VisitNone; + } } void State::Dump() { |