From 082e309d2a2c7da1e63586c5d115eceec8ccbf5e Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Thu, 21 Aug 2008 16:17:51 +0000 Subject: [PATCH] patch by Patrick Spendrin: fix MSVC compatibility --- Eigen/src/Core/util/Macros.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 1489a6be1..2f9fba579 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -28,6 +28,14 @@ #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 @@ -144,8 +152,7 @@ enum { RowsAtCompileTime = Eigen::ei_traits::RowsAtCompileTime, \ IsVectorAtCompileTime = Base::IsVectorAtCompileTime }; #define EIGEN_GENERIC_PUBLIC_INTERFACE(Derived) \ -_EIGEN_GENERIC_PUBLIC_INTERFACE(Derived, Eigen::MatrixBase) \ -friend class Eigen::MatrixBase; +_EIGEN_GENERIC_PUBLIC_INTERFACE(Derived, Eigen::MatrixBase) #define EIGEN_ENUM_MIN(a,b) (((int)a <= (int)b) ? (int)a : (int)b) #define EIGEN_ENUM_MAX(a,b) (((int)a >= (int)b) ? (int)a : (int)b)