mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Replaced SmallVector::ErasePreservingOrder(it, count) with std::vector::erase()

pull/7419/head
Henry Wilson 2018-09-24 20:18:16 +01:00 committed by PeterN
parent 8460952240
commit 9b5cc73f3e
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/animated_tile.cpp
View File

@ -27,10 +27,10 @@ SmallVector<TileIndex, 256> _animated_tiles;
*/ */
void DeleteAnimatedTile(TileIndex tile) void DeleteAnimatedTile(TileIndex tile)
{ {
TileIndex *to_remove = &*std::find(_animated_tiles.begin(), _animated_tiles.end(), tile); auto to_remove = std::find(_animated_tiles.begin(), _animated_tiles.end(), tile);
if (to_remove != _animated_tiles.End()) { if (to_remove != _animated_tiles.end()) {
/* The order of the remaining elements must stay the same, otherwise the animation loop may miss a tile. */ /* 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); MarkTileDirtyByTile(tile);
} }
} }

10
src/core/smallvec_type.hpp
View File

@ -148,16 +148,6 @@ public:
std::vector<T>::erase(it, it + count); 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. * 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. * The '!=' operator of T is used for comparison.