summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2018-09-24 20:24:40 +0100
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitb1f5119d3af2fb47a2f1c752d61a742f41076451 (patch)
treeb9243f929781864a629b45fa90326a07aa33fa77
parent9b5cc73f3eeefdad439b2d93d872e621891f2b38 (diff)
downloadopenttd-b1f5119d3af2fb47a2f1c752d61a742f41076451.tar.xz
Codechange: Replaced SmallVector::ErasePreservingOrder(pos, count) with std::vector::erase()
-rw-r--r--src/core/smallvec_type.hpp11
-rw-r--r--src/vehicle_gui.cpp2
2 files changed, 1 insertions, 12 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 7d856ca9b..5225d13da 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -138,17 +138,6 @@ public:
}
/**
- * Remove items from the vector while preserving the order of other items.
- * @param pos First item to remove.
- * @param count Number of consecutive items to remove.
- */
- void ErasePreservingOrder(uint pos, uint count = 1)
- {
- auto const it = std::vector<T>::begin() + pos;
- std::vector<T>::erase(it, it + count);
- }
-
- /**
* Tests whether a item is present in the vector, and appends it to the end if not.
* The '!=' operator of T is used for comparison.
* @param item Item to test for
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 95f0a28ec..6dd4bef33 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -494,7 +494,7 @@ struct RefitWindow : public Window {
while (pos < l.size() && l[pos].subtype != refit_cyc) pos++;
if (pos < l.size() && l[pos].string != subtype) {
/* String mismatch, remove item keeping the order */
- l.ErasePreservingOrder(pos);
+ l.erase(l.begin() + pos);
}
}
}