dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Codechange: Removed SmallVector completely

Browse Source
This commit is contained in:
Henry Wilson
2019-03-03 17:30:09 +00:00
committed by PeterN
parent 6570f7989f
commit c01a2e2a81
69 changed files with 109 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/pool_type.hpp
View File

@@ -26,7 +26,7 @@ enum PoolType {
};
DECLARE_ENUM_AS_BIT_SET(PoolType)
typedef SmallVector<struct PoolBase *, 4> PoolVector; ///< Vector of pointers to PoolBase
typedef std::vector<struct PoolBase *> PoolVector; ///< Vector of pointers to PoolBase
/** Base class for base of all pools. */
struct PoolBase {

2
src/core/smallmap_type.hpp
View File

@@ -40,7 +40,7 @@ struct SmallPair {
* @see SmallVector
*/
template <typename T, typename U, uint S = 16>
struct SmallMap : SmallVector<SmallPair<T, U>, S> {
struct SmallMap : std::vector<SmallPair<T, U> > {
typedef ::SmallPair<T, U> Pair;
typedef Pair *iterator;
typedef const Pair *const_iterator;

2
src/core/smallstack_type.hpp
View File

@@ -87,7 +87,7 @@ private:
Tindex first_free;
ThreadMutex *mutex;
SmallVector<SimplePoolPoolItem, Tgrowth_step> data;
std::vector<SimplePoolPoolItem> data;
};
/**

27
src/core/smallvec_type.hpp
View File

@@ -34,22 +34,6 @@ inline bool include(std::vector<T>& vec, const T &item)
return is_member;
}
/**
* Simple vector template class.
*
* @note There are no asserts in the class so you have
* to care about that you grab an item which is
* inside the list.
*
* @tparam T The type of the items stored
* @tparam S The steps of allocation
*/
template <typename T, uint S>
using SmallVector = std::vector<T>;
/**
* Helper function to get the index of an item
* Consider using std::set, std::unordered_set or std::flat_set in new code
@@ -73,19 +57,18 @@ int find_index(std::vector<T> const& vec, T const& item)
* Consider using std::back_inserter in new code
*
* @param vec A reference to the vector to be extended
* @param num The number of elements to default-construct
* @param num Number of elements to be default-constructed
*
* @return Pointer to the first new element
*/
template <typename T>
inline T* grow(std::vector<T>& vec, std::size_t num)
T* grow(std::vector<T>& vec, std::size_t num)
{
const std::size_t pos = vec.size();
std::size_t const pos = vec.size();
vec.resize(pos + num);
return vec.data() + pos;
}
/**
* Simple vector template class, with automatic free.
*
@@ -97,7 +80,7 @@ inline T* grow(std::vector<T>& vec, std::size_t num)
* @param S The steps of allocation
*/
template <typename T, uint S>
class AutoFreeSmallVector : public SmallVector<T, S> {
class AutoFreeSmallVector : public std::vector<T> {
public:
~AutoFreeSmallVector()
{
@@ -128,7 +111,7 @@ public:
* @param S The steps of allocation
*/
template <typename T, uint S>
class AutoDeleteSmallVector : public SmallVector<T, S> {
class AutoDeleteSmallVector : public std::vector<T> {
public:
~AutoDeleteSmallVector()
{