whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QVLA: separate control from inline storage [8/N]: emplace() 

Moving emplace() takes care of the bulk of insert()-like operations in
QVarLengthArray. What's missing now is just the pseudo-ranged
insert(i, n, x) and append(ptr, n) operations.

Task-number: QTBUG-84785
Change-Id: I8be7f50ecab3de79b617436c46d3feec065b4f88
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Marc Mutz 2021-12-08 13:31:42 +01:00
parent d666e7a779
commit 99894e33ba
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/tools/qvarlengtharray.h
View File

@ -203,6 +203,8 @@ protected:
++s;
return r;
}
template <typename...Args>
iterator emplace_impl(qsizetype prealloc, void *array, const_iterator pos, Args&&...arg);
template <typename S>
bool equal(const QVLABase<S> &other) const
@ -522,7 +524,8 @@ public:
using Base::back;
void shrink_to_fit() { squeeze(); }
template <typename...Args>
iterator emplace(const_iterator pos, Args &&...args);
iterator emplace(const_iterator pos, Args &&...args)
{ return Base::emplace_impl(Prealloc, this->array, pos, std::forward<Args>(args)...); }
template <typename...Args>
T &emplace_back(Args &&...args)
{ return Base::emplace_back_impl(Prealloc, this->array, std::forward<Args>(args)...); }
@ -807,9 +810,9 @@ inline void QVLABase<T>::replace(qsizetype i, const T &t)
data()[i] = t;
}
template <class T, qsizetype Prealloc>
template <class T>
template <typename...Args>
Q_OUTOFLINE_TEMPLATE auto QVarLengthArray<T, Prealloc>::emplace(const_iterator before, Args &&...args) -> iterator
Q_OUTOFLINE_TEMPLATE auto QVLABase<T>::emplace_impl(qsizetype prealloc, void *array, const_iterator before, Args &&...args) -> iterator
{
Q_ASSERT_X(isValidIterator(before), "QVarLengthArray::insert", "The specified const_iterator argument 'before' is invalid");
Q_ASSERT(size() <= capacity());
@ -817,7 +820,7 @@ Q_OUTOFLINE_TEMPLATE auto QVarLengthArray<T, Prealloc>::emplace(const_iterator b
qsizetype offset = qsizetype(before - cbegin());
if (size() == capacity())
reserve(size() * 2);
reallocate_impl(prealloc, array, size(), size() * 2);
if constexpr (!QTypeInfo<T>::isRelocatable) {
T *b = begin() + offset;
T *i = end();