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

Codechange: Replaced SmallVector::Find() const with suitable alternatives

Browse Source 
The use of std::none_of in network/core/host.cpp is driven by the non-const
comparison operator use by NetworkAddress. A future commit should address
the const_casts in that class to ensure const-correctness.
This commit is contained in:
Henry Wilson
2018-09-23 22:15:35 +01:00
committed by PeterN
parent 81315939b9
commit 8460952240
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/smallvec_type.hpp
View File

@@ -102,20 +102,6 @@ public:
return this->Begin() + start;
}
/**
* Search for the first occurrence of an item.
* The '!=' operator of T is used for comparison.
* @param item Item to search for
* @return The position of the item, or End() when not present
*/
inline const T *Find(const T &item) const
{
const T *pos = this->Begin();
const T *end = this->End();
while (pos != end && *pos != item) pos++;
return pos;
}
/**
* Search for the first occurrence of an item.
* The '!=' operator of T is used for comparison.
@@ -124,8 +110,8 @@ public:
*/
inline int FindIndex(const T &item) const
{
auto const it = this->Find(item);
return it == this->End() ? -1 : it - this->Begin();
auto const it = std::find(std::vector<T>::begin(), std::vector<T>::end(), item);
return it == std::vector<T>::end() ? -1 : it - std::vector<T>::begin();
}
/**
@@ -136,7 +122,7 @@ public:
*/
inline bool Contains(const T &item) const
{
return this->Find(item) != this->End();
return std::find(std::vector<T>::begin(), std::vector<T>::end(), item) != std::vector<T>::end();
}
/**