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

Don't use qMalloc/qFree in non-inline code 

This propagates changes in b08daaedd4 to
this branch.

Change-Id: I3b72f53c7b24d27075ea8593c347b504bfd8f581
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: hjk <qthjk@ovi.com>
bb10
João Abecasis 2012-01-13 16:39:10 +01:00 committed by Qt by Nokia
parent 9e9f7a482a
commit e465a8c58c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qarraydata.cpp
View File

@ -41,6 +41,8 @@
#include <QtCore/qarraydata.h>
#include <stdlib.h>
QT_BEGIN_NAMESPACE
const QArrayData QArrayData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
@ -70,7 +72,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
if (!(options & RawData))
allocSize += (alignment - Q_ALIGNOF(QArrayData));
QArrayData *header = static_cast<QArrayData *>(qMalloc(allocSize));
QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
Q_CHECK_PTR(header);
if (header) {
quintptr data = (quintptr(header) + sizeof(QArrayData) + alignment - 1)
@ -97,7 +99,7 @@ void QArrayData::deallocate(QArrayData *data, size_t objectSize,
if (data == &qt_array_unsharable_empty)
return;
qFree(data);
::free(data);
}
QT_END_NAMESPACE