diff options
-rw-r--r-- | Eigen/QtAlignedMalloc | 6 | ||||
-rw-r--r-- | Eigen/src/Core/util/DisableMSVCWarnings.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Eigen/QtAlignedMalloc b/Eigen/QtAlignedMalloc index de4da752c..fce7edf9b 100644 --- a/Eigen/QtAlignedMalloc +++ b/Eigen/QtAlignedMalloc @@ -6,8 +6,10 @@ #if (!EIGEN_MALLOC_ALREADY_ALIGNED) +#include "src/Core/util/DisableMSVCWarnings.h" + void *qMalloc(size_t size) -{std::cerr << "ok\n"; +{ return Eigen::ei_aligned_malloc(size); } @@ -24,6 +26,8 @@ void *qRealloc(void *ptr, size_t size) return newPtr; } +#include "src/Core/util/EnableMSVCWarnings.h" + #endif #endif // EIGEN_QTMALLOC_MODULE_H diff --git a/Eigen/src/Core/util/DisableMSVCWarnings.h b/Eigen/src/Core/util/DisableMSVCWarnings.h index ca8e245b3..c08d0389f 100644 --- a/Eigen/src/Core/util/DisableMSVCWarnings.h +++ b/Eigen/src/Core/util/DisableMSVCWarnings.h @@ -1,5 +1,6 @@ #ifdef _MSC_VER + // 4273 - QtAlignedMalloc, inconsistent dll linkage #pragma warning( push ) - #pragma warning( disable : 4181 4244 4127 4211 4522 4717 ) + #pragma warning( disable : 4181 4244 4127 4211 4273 4522 4717 ) #endif |