petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: Replaced SmallVector::Erase() with std::vector::erase()

Browse Source
This commit is contained in:
Henry Wilson
2018-09-25 22:01:05 +01:00
committed by PeterN
parent 097328c3d7
commit ca2f33c6d0
8 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/station_cmd.cpp
View File

@@ -3541,8 +3541,8 @@ void DeleteStaleLinks(Station *from)
*(vehicles.Append()) = l->GetFirstSharedVehicle();
}
Vehicle **iter = vehicles.Begin();
while (iter != vehicles.End()) {
auto iter = vehicles.begin();
while (iter != vehicles.end()) {
Vehicle *v = *iter;
LinkRefresher::Run(v, false); // Don't allow merging. Otherwise lg might get deleted.
@@ -3556,10 +3556,10 @@ void DeleteStaleLinks(Station *from)
*iter = next_shared;
++iter;
} else {
vehicles.Erase(iter);
iter = vehicles.erase(iter);
}
if (iter == vehicles.End()) iter = vehicles.Begin();
if (iter == vehicles.end()) iter = vehicles.begin();
}
}