From 9b5cc73f3eeefdad439b2d93d872e621891f2b38 Mon Sep 17 00:00:00 2001
From: Henry Wilson <m3henry@googlemail.com>
Date: Mon, 24 Sep 2018 20:18:16 +0100
Subject: [PATCH] Codechange: Replaced SmallVector::ErasePreservingOrder(it,
 count) with std::vector::erase()

---
 src/animated_tile.cpp      |  6 +++---
 src/core/smallvec_type.hpp | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/animated_tile.cpp b/src/animated_tile.cpp
index 3341f57951..eb10b9b8d1 100644
--- a/src/animated_tile.cpp
+++ b/src/animated_tile.cpp
@@ -27,10 +27,10 @@ SmallVector<TileIndex, 256> _animated_tiles;
  */
 void DeleteAnimatedTile(TileIndex tile)
 {
-	TileIndex *to_remove = &*std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
-	if (to_remove != _animated_tiles.End()) {
+	auto to_remove = std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
+	if (to_remove != _animated_tiles.end()) {
 		/* The order of the remaining elements must stay the same, otherwise the animation loop may miss a tile. */
-		_animated_tiles.ErasePreservingOrder(to_remove);
+		_animated_tiles.erase(to_remove);
 		MarkTileDirtyByTile(tile);
 	}
 }
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 1c713470f6..7d856ca9ba 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -148,16 +148,6 @@ public:
 		std::vector<T>::erase(it, it + count);
 	}
 
-	/**
-	 * Remove items from the vector while preserving the order of other items.
-	 * @param item First item to remove.
-	 * @param count Number of consecutive items to remove.
-	 */
-	inline void ErasePreservingOrder(T *item, uint count = 1)
-	{
-		this->ErasePreservingOrder(item - this->Begin(), 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.