summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfonsinchen <fonsinchen@openttd.org>2016-07-10 11:57:16 +0000
committerfonsinchen <fonsinchen@openttd.org>2016-07-10 11:57:16 +0000
commite2426b22fa0e605834d016d7116d0a8ed2e8223e (patch)
tree23632dd39f231b56abc5a70c5ac29951c147ac1c /src
parentbcdae9a093cf14a6eea0eab97d464f17688596ea (diff)
downloadopenttd-e2426b22fa0e605834d016d7116d0a8ed2e8223e.tar.xz
(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)
Diffstat (limited to 'src')
-rw-r--r--src/linkgraph/demands.cpp18
-rw-r--r--src/linkgraph/linkgraph_gui.h4
-rw-r--r--src/linkgraph/refresh.h4
3 files changed, 13 insertions, 13 deletions
diff --git a/src/linkgraph/demands.cpp b/src/linkgraph/demands.cpp
index 767bec2c9..f4afbabf0 100644
--- a/src/linkgraph/demands.cpp
+++ b/src/linkgraph/demands.cpp
@@ -2,11 +2,11 @@
#include "../stdafx.h"
#include "demands.h"
-#include <list>
+#include <queue>
#include "../safeguards.h"
-typedef std::list<NodeID> NodeList;
+typedef std::queue<NodeID> NodeList;
/**
* Scale various things according to symmetric/asymmetric distribution.
@@ -172,11 +172,11 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
for (NodeID node = 0; node < job.Size(); node++) {
scaler.AddNode(job[node]);
if (job[node].Supply() > 0) {
- supplies.push_back(node);
+ supplies.push(node);
num_supplies++;
}
if (job[node].Demand() > 0) {
- demands.push_back(node);
+ demands.push(node);
num_demands++;
}
}
@@ -191,17 +191,17 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
while (!supplies.empty() && !demands.empty()) {
NodeID from_id = supplies.front();
- supplies.pop_front();
+ supplies.pop();
for (uint i = 0; i < num_demands; ++i) {
assert(!demands.empty());
NodeID to_id = demands.front();
- demands.pop_front();
+ demands.pop();
if (from_id == to_id) {
/* Only one node with supply and demand left */
if (demands.empty() && supplies.empty()) return;
- demands.push_back(to_id);
+ demands.push(to_id);
continue;
}
@@ -236,7 +236,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
scaler.SetDemands(job, from_id, to_id, demand_forw);
if (scaler.HasDemandLeft(job[to_id])) {
- demands.push_back(to_id);
+ demands.push(to_id);
} else {
num_demands--;
}
@@ -245,7 +245,7 @@ void DemandCalculator::CalcDemand(LinkGraphJob &job, Tscaler scaler)
}
if (job[from_id].UndeliveredSupply() != 0) {
- supplies.push_back(from_id);
+ supplies.push(from_id);
} else {
num_supplies--;
}
diff --git a/src/linkgraph/linkgraph_gui.h b/src/linkgraph/linkgraph_gui.h
index fcf81817f..1e306a44d 100644
--- a/src/linkgraph/linkgraph_gui.h
+++ b/src/linkgraph/linkgraph_gui.h
@@ -17,7 +17,7 @@
#include "../widget_type.h"
#include "linkgraph_base.h"
#include <map>
-#include <list>
+#include <vector>
/**
* Properties of a link between two stations.
@@ -39,7 +39,7 @@ class LinkGraphOverlay {
public:
typedef std::map<StationID, LinkProperties> StationLinkMap;
typedef std::map<StationID, StationLinkMap> LinkMap;
- typedef std::list<std::pair<StationID, uint> > StationSupplyList;
+ typedef std::vector<std::pair<StationID, uint> > StationSupplyList;
static const uint8 LINK_COLOURS[];
diff --git a/src/linkgraph/refresh.h b/src/linkgraph/refresh.h
index 496729df7..6687b8a3b 100644
--- a/src/linkgraph/refresh.h
+++ b/src/linkgraph/refresh.h
@@ -14,7 +14,7 @@
#include "../cargo_type.h"
#include "../vehicle_base.h"
-#include <list>
+#include <vector>
#include <map>
#include <set>
@@ -79,7 +79,7 @@ protected:
bool operator<(const Hop &other) const;
};
- typedef std::list<RefitDesc> RefitList;
+ typedef std::vector<RefitDesc> RefitList;
typedef std::map<CargoID, uint> CapacitiesMap;
typedef std::set<Hop> HopSet;