Removed debug cout.

Disabled MSVC inconsistent DLL linkage.
This commit is contained in:
Hauke Heibel 2009-09-02 21:23:09 +02:00
parent e6c9d6c528
commit 8d449bd80e
2 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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