Code cleanup.

This commit is contained in:
Hauke Heibel 2009-10-22 20:06:05 +02:00
parent 76d578fb99
commit fc8b54c142

View File

@ -1,6 +1,8 @@
#ifndef EIGEN_QTMALLOC_MODULE_H #ifndef EIGEN_QTMALLOC_MODULE_H
#define EIGEN_QTMALLOC_MODULE_H #define EIGEN_QTMALLOC_MODULE_H
#if (!EIGEN_MALLOC_ALREADY_ALIGNED)
#ifdef QVECTOR_H #ifdef QVECTOR_H
#error You must include <Eigen/QtAlignedMalloc> before <QtCore/QVector>. #error You must include <Eigen/QtAlignedMalloc> before <QtCore/QVector>.
#endif #endif
@ -16,9 +18,6 @@
#include "Core" #include "Core"
#include <QtCore/QVector> #include <QtCore/QVector>
#include <QtCore/QVectorData>
#if (!EIGEN_MALLOC_ALREADY_ALIGNED)
inline void *qMalloc(size_t size) inline void *qMalloc(size_t size)
{ {
@ -38,16 +37,6 @@ inline void *qRealloc(void *ptr, size_t size)
return newPtr; return newPtr;
} }
// needed to copy that too because it is implemented in the qt binary library, hence
// wouldn't otherwise honor our qMalloc.
QVectorData *QVectorData::malloc(int sizeofTypedData, int size, int sizeofT, QVectorData *init)
{
QVectorData* p = (QVectorData *)qMalloc(sizeofTypedData + (size - 1) * sizeofT);
Q_CHECK_PTR(p);
::memcpy(p, init, sizeofTypedData + (qMin(size, init->alloc) - 1) * sizeofT);
return p;
}
#endif #endif
#ifdef Q_DECL_IMPORT_ORIG #ifdef Q_DECL_IMPORT_ORIG