diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-08-21 16:17:51 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-08-21 16:17:51 +0000 |
| commit | 082e309d2a2c7da1e63586c5d115eceec8ccbf5e (patch) | |
| tree | 76b8956685a946c7d82bfb6c1b20e7dfe2b7ce9b /Eigen/src/Core/util | |
| parent | 67813e01bf4c10adf413bdac057043f44c2439d7 (diff) | |
patch by Patrick Spendrin: fix MSVC compatibility
Diffstat (limited to 'Eigen/src/Core/util')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 11 |
1 files 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<Derived>::RowsAtCompileTime, \ IsVectorAtCompileTime = Base::IsVectorAtCompileTime }; #define EIGEN_GENERIC_PUBLIC_INTERFACE(Derived) \ -_EIGEN_GENERIC_PUBLIC_INTERFACE(Derived, Eigen::MatrixBase<Derived>) \ -friend class Eigen::MatrixBase<Derived>; +_EIGEN_GENERIC_PUBLIC_INTERFACE(Derived, Eigen::MatrixBase<Derived>) #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) |