summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2018-09-25 20:44:39 +0100
committerPeterN <peter@fuzzle.org>2019-03-26 20:15:57 +0000
commitbc7dcaffca553b227fe895dc185e657d110c5ffe (patch)
treebb26d6af56935314c1a75d4853db40a9c824c672 /src/core
parent5795f66d2eebccbc8e04b80ebaf163f636479f9e (diff)
downloadopenttd-bc7dcaffca553b227fe895dc185e657d110c5ffe.tar.xz
Codechange: Removed SmallVector::Assign()
Diffstat (limited to 'src/core')
-rw-r--r--src/core/smallvec_type.hpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/src/core/smallvec_type.hpp b/src/core/smallvec_type.hpp
index 9df015ad8..81b9cf7ee 100644
--- a/src/core/smallvec_type.hpp
+++ b/src/core/smallvec_type.hpp
@@ -60,24 +60,13 @@ public:
template <uint X>
SmallVector &operator=(const SmallVector<T, X> &other)
{
- this->Assign(other);
+ std::vector<T>::operator=(other);
return *this;
}
~SmallVector() = default;
/**
- * Assign items from other vector.
- */
- template <uint X>
- inline void Assign(const SmallVector<T, X> &other)
- {
- if ((const void *)&other == (void *)this) return;
-
- std::vector<T>::operator=(other);
- }
-
- /**
* Append an item and return it.
* @param to_add the number of items to append
* @return pointer to newly allocated item