diff options
author | Henry Wilson <m3henry@googlemail.com> | 2019-03-03 17:30:09 +0000 |
---|---|---|
committer | PeterN <peter@fuzzle.org> | 2019-03-26 20:15:57 +0000 |
commit | c01a2e2a81d8e7bcd47d46292ed0b7d452081c31 (patch) | |
tree | b38441ec8469136a6a2252f8c856d22f14ee689e /src/core/smallvec_type.hpp | |
parent | 6570f7989f5c1fc5a1276505a8e6efce7838efd9 (diff) | |
download | openttd-c01a2e2a81d8e7bcd47d46292ed0b7d452081c31.tar.xz |
Codechange: Removed SmallVector completely
Diffstat (limited to 'src/core/smallvec_type.hpp')
-rw-r--r-- | src/core/smallvec_type.hpp | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp index 6f86e11cc..19dab2228 100644 --- a/src/core/smallvec_type.hpp +++ b/src/core/smallvec_type.hpp @@ -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() { |