From 0998c51d1f45d408f0d7c285c88b234d933401a0 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 21 Aug 2008 21:07:24 +0000 Subject: [PATCH] - remove the ASM macro as in fact Gael had been removing all the remaining asm("...") from the code while fixing MSVC compat (so your changes crossed one another). - move the pragma warning to CoreDeclarations, it's the right place to do early platform checks. CCMAIL:ps_ml@gmx.de --- Eigen/CoreDeclarations | 4 ++++ Eigen/src/Core/util/Macros.h | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Eigen/CoreDeclarations b/Eigen/CoreDeclarations index 7f391f676..4c85b6d65 100644 --- a/Eigen/CoreDeclarations +++ b/Eigen/CoreDeclarations @@ -1,6 +1,10 @@ #ifndef EIGEN_CORE_DECLARATIONS_H #define EIGEN_CORE_DECLARATIONS_H +#ifdef _MSC_VER +#pragma warning( disable : 4181 4244 ) +#endif + #ifdef __GNUC__ #define EIGEN_GNUC_AT_LEAST(x,y) ((__GNUC__>=x && __GNUC_MINOR__>=y) || __GNUC__>x) #else diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 2f9fba579..a4530f353 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -28,14 +28,6 @@ #undef minor -#ifdef _MSC_VER -#pragma warning( disable : 4181 4244 ) -#define ASM(name) __asm(name) -#else -#define ASM(name) asm(name) -#endif - - #ifdef EIGEN_DONT_USE_UNROLLED_LOOPS #define EIGEN_UNROLLING_LIMIT 0 #endif