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

Fix error on MSVC when QList with disabled rvalues is instantiated

Browse Source 
MSVC does in some case full instantiation of the template. Make sure
all of it expands to valid C++, even in the case where those methods
are supposed to be disabled.

Fixes: QTBUG-86289
Change-Id: Iaae39ef60fc5cf5fee273b0934a5a52b6ae4ec17
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Lars Knoll 2020-08-29 19:13:15 +02:00
parent aa136d46e1
commit fc80bd201c
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/tools/qlist.h
View File

@ -312,7 +312,14 @@ public:
const_reference operator[](qsizetype i) const noexcept { return at(i); } const_reference operator[](qsizetype i) const noexcept { return at(i); }
void append(parameter_type t) { emplaceBack(t); } void append(parameter_type t) { emplaceBack(t); }
void append(const_iterator i1, const_iterator i2); void append(const_iterator i1, const_iterator i2);
void append(rvalue_ref t) { emplaceBack(std::move(t)); } void append(rvalue_ref t)
{
if constexpr (DataPointer::pass_parameter_by_value) {
Q_UNUSED(t);
} else {
emplaceBack(std::move(t));
}
}
void append(const QList<T> &l) void append(const QList<T> &l)
{ {
// protect against l == *this // protect against l == *this
@ -320,7 +327,13 @@ public:
append(list.constBegin(), list.constEnd()); append(list.constBegin(), list.constEnd());
} }
void append(QList<T> &&l); void append(QList<T> &&l);
void prepend(rvalue_ref t) { emplaceFront(std::move(t)); } void prepend(rvalue_ref t) {
if constexpr (DataPointer::pass_parameter_by_value) {
Q_UNUSED(t);
} else {
emplaceFront(std::move(t));
}
}
void prepend(parameter_type t) { emplaceFront(t); } void prepend(parameter_type t) { emplaceFront(t); }
template<typename... Args> template<typename... Args>
@ -347,7 +360,15 @@ public:
Q_ASSERT_X(isValidIterator(before), "QList::insert", "The specified iterator argument 'before' is invalid"); Q_ASSERT_X(isValidIterator(before), "QList::insert", "The specified iterator argument 'before' is invalid");
return insert(std::distance(constBegin(), before), std::move(t)); return insert(std::distance(constBegin(), before), std::move(t));
} }
iterator insert(qsizetype i, rvalue_ref t) { return emplace(i, std::move(t)); } iterator insert(qsizetype i, rvalue_ref t) {
if constexpr (DataPointer::pass_parameter_by_value) {
Q_UNUSED(i);
Q_UNUSED(t);
return end();
} else {
return emplace(i, std::move(t));
}
}
template <typename ...Args> template <typename ...Args>
iterator emplace(const_iterator before, Args&&... args) iterator emplace(const_iterator before, Args&&... args)
@ -371,9 +392,14 @@ public:
} }
void replace(qsizetype i, rvalue_ref t) void replace(qsizetype i, rvalue_ref t)
{ {
Q_ASSERT_X(i >= 0 && i < d->size, "QList<T>::replace", "index out of range"); if constexpr (DataPointer::pass_parameter_by_value) {
const T copy(std::move(t)); Q_UNUSED(i);
data()[i] = std::move(copy); Q_UNUSED(t);
} else {
Q_ASSERT_X(i >= 0 && i < d->size, "QList<T>::replace", "index out of range");
const T copy(std::move(t));
data()[i] = std::move(copy);
}
} }
void remove(qsizetype i, qsizetype n = 1); void remove(qsizetype i, qsizetype n = 1);