1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QVarLengthArray: don't mix iterator/const_iterator in offset calc

Browse Source 
The functions aren't const so begin() will return a mutable
iterator. The function arguments, however, are const_iterators.

It doesn't matter for QVLA, which isn't implicitly shared, but code
hygiene suggests to use cbegin() instead, to compare const_iterators
to const_iterators.

Change-Id: I9bfa993780ee4b68d13f6b6410772b0f1ccedad3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Marc Mutz 2021-12-07 14:16:31 +01:00
parent dbf836738a
commit ac4c0e1f02
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -631,7 +631,7 @@ Q_OUTOFLINE_TEMPLATE auto QVarLengthArray<T, Prealloc>::emplace(const_iterator b
Q_ASSERT(size() <= capacity());
Q_ASSERT(capacity() > 0);
qsizetype offset = qsizetype(before - begin());
qsizetype offset = qsizetype(before - cbegin());
if (size() == capacity())
reserve(size() * 2);
if constexpr (!QTypeInfo<T>::isRelocatable) {
@ -661,7 +661,7 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA
{
Q_ASSERT_X(isValidIterator(before), "QVarLengthArray::insert", "The specified const_iterator argument 'before' is invalid");
qsizetype offset = qsizetype(before - begin());
qsizetype offset = qsizetype(before - cbegin());
if (n != 0) {
const T copy(t); // `t` could alias an element in [begin(), end()[
resize(size() + n);
@ -691,8 +691,8 @@ Q_OUTOFLINE_TEMPLATE typename QVarLengthArray<T, Prealloc>::iterator QVarLengthA
Q_ASSERT_X(isValidIterator(abegin), "QVarLengthArray::insert", "The specified const_iterator argument 'abegin' is invalid");
Q_ASSERT_X(isValidIterator(aend), "QVarLengthArray::insert", "The specified const_iterator argument 'aend' is invalid");
qsizetype f = qsizetype(abegin - begin());
qsizetype l = qsizetype(aend - begin());
qsizetype f = qsizetype(abegin - cbegin());
qsizetype l = qsizetype(aend - cbegin());
qsizetype n = l - f;
if constexpr (QTypeInfo<T>::isComplex) {