diff options
| author | Robert Iannucci <robbie@rail.com> | 2013-03-23 21:31:05 (GMT) |
|---|---|---|
| committer | Robert Iannucci <robbie@rail.com> | 2013-03-23 21:31:05 (GMT) |
| commit | f31836a18621a5477ae6888d832afb96f1a56f52 (patch) | |
| tree | b893cbdc1932c9b2cd3de443e9afe56be785d753 /src | |
| parent | 8e70a53058a74d3582c609fd9f7c133dae7387b4 (diff) | |
| download | Ninja-f31836a18621a5477ae6888d832afb96f1a56f52.zip Ninja-f31836a18621a5477ae6888d832afb96f1a56f52.tar.gz Ninja-f31836a18621a5477ae6888d832afb96f1a56f52.tar.bz2 | |
Fix debug build on linux (type strictness).
Diffstat (limited to 'src')
| -rw-r--r-- | src/state.cc | 4 | ||||
| -rw-r--r-- | src/state.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/state.cc b/src/state.cc index cd43e0d..9f46fee 100644 --- a/src/state.cc +++ b/src/state.cc @@ -39,7 +39,7 @@ void Pool::DelayEdge(Edge* edge) { } void Pool::RetrieveReadyEdges(set<Edge*>* ready_queue) { - set<Edge*>::iterator it = delayed_.begin(); + DelayedEdges::iterator it = delayed_.begin(); while (it != delayed_.end()) { Edge* edge = *it; if (current_use_ + edge->weight() > depth_) @@ -53,7 +53,7 @@ void Pool::RetrieveReadyEdges(set<Edge*>* ready_queue) { void Pool::Dump() const { printf("%s (%d/%d) ->\n", name_.c_str(), current_use_, depth_); - for (set<Edge*>::const_iterator it = delayed_.begin(); + for (DelayedEdges::const_iterator it = delayed_.begin(); it != delayed_.end(); ++it) { printf("\t"); diff --git a/src/state.h b/src/state.h index 279a64a..7e3aead 100644 --- a/src/state.h +++ b/src/state.h @@ -76,7 +76,8 @@ struct Pool { static bool WeightedEdgeCmp(const Edge* a, const Edge* b); - set<Edge*,bool(*)(const Edge*, const Edge*)> delayed_; + typedef set<Edge*,bool(*)(const Edge*, const Edge*)> DelayedEdges; + DelayedEdges delayed_; }; /// Global state (file status, loaded rules) for a single run. |