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

Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector

Browse Source
This commit is contained in:
Henry Wilson
2019-03-04 20:49:33 +00:00
committed by PeterN
parent c01a2e2a81
commit cc62f4163f
21 changed files with 53 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/smallmap_type.hpp
View File

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

8
src/core/smallvec_type.hpp
View File

@@ -77,9 +77,8 @@ T* grow(std::vector<T>& vec, std::size_t num)
* inside the list.
*
* @param T The type of the items stored, must be a pointer
* @param S The steps of allocation
*/
template <typename T, uint S>
template <typename T>
class AutoFreeSmallVector : public std::vector<T> {
public:
~AutoFreeSmallVector()
@@ -108,9 +107,8 @@ public:
* inside the list.
*
* @param T The type of the items stored, must be a pointer
* @param S The steps of allocation
*/
template <typename T, uint S>
template <typename T>
class AutoDeleteSmallVector : public std::vector<T> {
public:
~AutoDeleteSmallVector()
@@ -131,6 +129,6 @@ public:
}
};
typedef AutoFreeSmallVector<char*, 4> StringList; ///< Type for a list of strings.
typedef AutoFreeSmallVector<char*> StringList; ///< Type for a list of strings.
#endif /* SMALLVEC_TYPE_HPP */