diff options
Diffstat (limited to 'src/corelib/tools/qvarlengtharray.h')
| -rw-r--r-- | src/corelib/tools/qvarlengtharray.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 4e042f765e..6ce6573843 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -48,6 +48,7 @@ #include <new> #include <string.h> +#include <stdlib.h> QT_BEGIN_HEADER @@ -77,7 +78,7 @@ public: i->~T(); } if (ptr != reinterpret_cast<T *>(array)) - qFree(ptr); + free(ptr); } inline QVarLengthArray<T, Prealloc> &operator=(const QVarLengthArray<T, Prealloc> &other) { @@ -190,7 +191,7 @@ template <class T, int Prealloc> Q_INLINE_TEMPLATE QVarLengthArray<T, Prealloc>::QVarLengthArray(int asize) : s(asize) { if (s > Prealloc) { - ptr = reinterpret_cast<T *>(qMalloc(s * sizeof(T))); + ptr = reinterpret_cast<T *>(malloc(s * sizeof(T))); Q_CHECK_PTR(ptr); a = s; } else { @@ -243,7 +244,7 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a const int copySize = qMin(asize, osize); if (aalloc != a) { - ptr = reinterpret_cast<T *>(qMalloc(aalloc * sizeof(T))); + ptr = reinterpret_cast<T *>(malloc(aalloc * sizeof(T))); Q_CHECK_PTR(ptr); if (ptr) { s = 0; @@ -263,7 +264,7 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a while (sClean < osize) (oldPtr+(sClean++))->~T(); if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr) - qFree(oldPtr); + free(oldPtr); QT_RETHROW; } } else { @@ -283,7 +284,7 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a } if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr) - qFree(oldPtr); + free(oldPtr); if (QTypeInfo<T>::isComplex) { // call default constructor for new objects (which can throw) |