diff options
| author | Robert Iannucci <robbie@rail.com> | 2012-11-30 00:36:16 (GMT) |
|---|---|---|
| committer | Robert Iannucci <robbie@rail.com> | 2012-11-30 00:36:16 (GMT) |
| commit | 02b9cbaea9d41bb9228aebbc1fe8c53ccdb4744c (patch) | |
| tree | acdf125b8c2343419dd8f33636e3f921f58c1498 | |
| parent | 3311c32f3e5b405a84af7decfa168f33a250f11b (diff) | |
| download | Ninja-02b9cbaea9d41bb9228aebbc1fe8c53ccdb4744c.zip Ninja-02b9cbaea9d41bb9228aebbc1fe8c53ccdb4744c.tar.gz Ninja-02b9cbaea9d41bb9228aebbc1fe8c53ccdb4744c.tar.bz2 | |
Make Edge->pool() a pointer like it should have been
| -rw-r--r-- | src/build.cc | 14 | ||||
| -rw-r--r-- | src/graph.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/build.cc b/src/build.cc index cadf7dc..eacac50 100644 --- a/src/build.cc +++ b/src/build.cc @@ -409,19 +409,19 @@ Edge* Plan::FindWork() { } void Plan::ScheduleWork(Edge* edge) { - Pool& pool = edge->pool(); - if (pool.ShouldDelayEdge(*edge)) { - pool.DelayEdge(edge); - pool.RetrieveReadyEdges(&ready_); + Pool* pool = edge->pool(); + if (pool->ShouldDelayEdge(*edge)) { + pool->DelayEdge(edge); + pool->RetrieveReadyEdges(&ready_); } else { - pool.EdgeScheduled(*edge); + pool->EdgeScheduled(*edge); ready_.insert(edge); } } void Plan::ResumeDelayedJobs(Edge* edge) { - edge->pool().EdgeFinished(*edge); - edge->pool().RetrieveReadyEdges(&ready_); + edge->pool()->EdgeFinished(*edge); + edge->pool()->RetrieveReadyEdges(&ready_); } void Plan::EdgeFinished(Edge* edge) { diff --git a/src/graph.h b/src/graph.h index 4d24c72..ce92679 100644 --- a/src/graph.h +++ b/src/graph.h @@ -175,7 +175,7 @@ struct Edge { bool outputs_ready_; const Rule& rule() const { return *rule_; } - Pool& pool() const { return *pool_; } + Pool* pool() const { return pool_; } int weight() const { return 1; } bool outputs_ready() const { return outputs_ready_; } |