summaryrefslogtreecommitdiff
path: root/src/train_gui.cpp
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-02-17 11:20:52 +0000
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitab711e6942757d775c08c31a6c32d488feba1dba (patch)
treed102dc6d0e6b9c33e7205b63e3360ebd720a3ebb /src/train_gui.cpp
parent297fd3dda3abe353ebe2fe77c67b011e24d403bc (diff)
downloadopenttd-ab711e6942757d775c08c31a6c32d488feba1dba.tar.xz
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
Diffstat (limited to 'src/train_gui.cpp')
-rw-r--r--src/train_gui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index 3036096c8..427d45dea 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -278,10 +278,10 @@ static void GetCargoSummaryOfArticulatedVehicle(const Train *v, CargoSummary *su
new_item.subtype = GetCargoSubtypeText(v);
if (new_item.cargo == INVALID_CARGO && new_item.subtype == STR_EMPTY) continue;
- CargoSummaryItem *item = &*std::find(summary->begin(), summary->end(), new_item);
- if (item == summary->End()) {
- /*C++17: item = &*/ summary->emplace_back();
- item = &summary->back();
+ auto item = std::find(summary->begin(), summary->end(), new_item);
+ if (item == summary->end()) {
+ summary->emplace_back();
+ item = summary->end() - 1;
item->cargo = new_item.cargo;
item->subtype = new_item.subtype;
item->capacity = 0;