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

QVarLengthArray: use memory on stack if possible

Browse Source 
After allocating memory on the heap it is ATM not possible to use the
memory on the stack again, QVarLengthArray then uses/resizes only
the memory on the heap. But the memory on stack could be used
if it is big enough.

Change-Id: I566003c25dd1093eb6ba8087a1e5378a11712934
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Peter Kümmel 2012-10-09 16:52:37 +02:00 committed by The Qt Project
parent a47f21edd6
commit 47b99599e8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,12 +252,17 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
const int copySize = qMin(asize, osize); const int copySize = qMin(asize, osize);
if (aalloc != a) { if (aalloc != a) {
T* newPtr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T))); if (aalloc > Prealloc) {
Q_CHECK_PTR(newPtr); // could throw T* newPtr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T)));
// by design: in case of QT_NO_EXCEPTIONS malloc must not fail or it crashes here Q_CHECK_PTR(newPtr); // could throw
ptr = newPtr; // by design: in case of QT_NO_EXCEPTIONS malloc must not fail or it crashes here
ptr = newPtr;
a = aalloc;
} else {
ptr = reinterpret_cast<T *>(array);
a = Prealloc;
}
s = 0; s = 0;
a = aalloc;
if (QTypeInfo<T>::isStatic) { if (QTypeInfo<T>::isStatic) {
QT_TRY { QT_TRY {
// copy all the old elements // copy all the old elements