diff options
| author | Michael Lutz <michi@icosahedron.de> | 2020-05-17 23:31:44 +0200 |
|---|---|---|
| committer | Michael Lutz <michi@icosahedron.de> | 2020-05-21 20:02:34 +0200 |
| commit | f2b40f40aa7cbccaed20ec52b41d4704a45d8db1 (patch) | |
| tree | 2f8268a7292118c9e460524a139ab85766ed3425 /src/vehicle.cpp | |
| parent | 7309bdec48c70499301eb579991c2db6f7ef1d99 (diff) | |
| download | openttd-f2b40f40aa7cbccaed20ec52b41d4704a45d8db1.tar.xz | |
Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index ae5af64a1..72ef5a31a 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2278,7 +2278,7 @@ void Vehicle::GetConsistFreeCapacities(SmallMap<CargoID, uint> &capacities) cons { for (const Vehicle *v = this; v != nullptr; v = v->Next()) { if (v->cargo_cap == 0) continue; - SmallPair<CargoID, uint> *pair = capacities.Find(v->cargo_type); + std::pair<CargoID, uint> *pair = capacities.Find(v->cargo_type); if (pair == capacities.End()) { capacities.push_back({v->cargo_type, v->cargo_cap - v->cargo.StoredCount()}); } else { |