From 6d4f7f76ce757e8a1f577c80657dfc1d63b2b013 Mon Sep 17 00:00:00 2001 From: williami Date: Mon, 4 Jun 2012 10:21:16 -0500 Subject: [PATCH] Fixed RVCT 3.1 compiler errors. (transplanted from fc5f21903b7dde8c0681b25d7b1ef5aaf8b60a50 ) --- Eigen/Core | 2 +- Eigen/src/Core/PlainObjectBase.h | 2 +- Eigen/src/Core/util/Macros.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Eigen/Core b/Eigen/Core index a5025e37e..136c1bbd5 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -136,7 +136,7 @@ #endif // MSVC for windows mobile does not have the errno.h file -#if !(defined(_MSC_VER) && defined(_WIN32_WCE)) +#if !(defined(_MSC_VER) && defined(_WIN32_WCE)) && !defined(__ARMCC_VERSION) #define EIGEN_HAS_ERRNO #endif diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h index 612254e9d..f4460a84d 100644 --- a/Eigen/src/Core/PlainObjectBase.h +++ b/Eigen/src/Core/PlainObjectBase.h @@ -47,7 +47,7 @@ EIGEN_ALWAYS_INLINE void check_rows_cols_for_overflow(Index rows, Index cols) throw_std_bad_alloc(); } -template (Derived::IsVectorAtCompileTime)> struct conservative_resize_like_impl; +template struct conservative_resize_like_impl; template struct matrix_swap_impl; diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index b7c2b79af..e9733e6ab 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -265,7 +265,7 @@ * If we made alignment depend on whether or not EIGEN_VECTORIZE is defined, it would be impossible to link * vectorized and non-vectorized code. */ -#if (defined __GNUC__) || (defined __PGI) || (defined __IBMCPP__) +#if (defined __GNUC__) || (defined __PGI) || (defined __IBMCPP__) || (defined __ARMCC_VERSION) #define EIGEN_ALIGN_TO_BOUNDARY(n) __attribute__((aligned(n))) #elif (defined _MSC_VER) #define EIGEN_ALIGN_TO_BOUNDARY(n) __declspec(align(n))