diff options
author | Henry Wilson <m3henry@googlemail.com> | 2018-09-25 22:01:05 +0100 |
---|---|---|
committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
commit | ca2f33c6d025c0c45fb4bc472493290445312de5 (patch) | |
tree | cf39f3f0a815778049c037d80f0b86a11f1af665 /src/station_cmd.cpp | |
parent | 097328c3d73520834b4ef801945c4f57f9eca0cd (diff) | |
download | openttd-ca2f33c6d025c0c45fb4bc472493290445312de5.tar.xz |
Codechange: Replaced SmallVector::Erase() with std::vector::erase()
Diffstat (limited to 'src/station_cmd.cpp')
-rw-r--r-- | src/station_cmd.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index f7e2a1824..2dee09fe8 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -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(); } } |