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

QVarLengthArray: clear() is not resize(0)

Browse Source 
The latter needs the value_type to be default-constructible, which
shouldn't be required to clear() a container.

Use std::destroy_n() instead.

[ChangeLog][QtCore][QVarLengthArray] clear() no longer requires the
value_type to be default-constructible.

Manual conflict resolutions:
 - No QVLAStorage/Base/QVarLengthArray split in 6.2, yet

Change-Id: I806de8f3826b50c0bd38156892c3afeb15f13ac9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit fbfee2d7c59a7c6cd17ae7a3f63f983b9f3316f5)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2023-02-10 14:25:20 +01:00
parent df8cf211cc
commit c581474dfb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,12 @@ public:
} }
inline bool isEmpty() const { return (s == 0); } inline bool isEmpty() const { return (s == 0); }
inline void resize(qsizetype size); inline void resize(qsizetype size);
inline void clear() { resize(0); } void clear()
{
if constexpr (QTypeInfo<T>::isComplex)
std::destroy_n(data(), size());
s = 0;
}
inline void squeeze(); inline void squeeze();
inline qsizetype capacity() const { return a; } inline qsizetype capacity() const { return a; }