From 659c97ee4961727b28e2a5c072f670c29ebf928e Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 22 Feb 2011 10:04:09 +0100 Subject: [PATCH] gcc 4.4 also defines float32_t as a special type --- Eigen/src/Core/arch/NEON/PacketMath.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Eigen/src/Core/arch/NEON/PacketMath.h b/Eigen/src/Core/arch/NEON/PacketMath.h index 536fea3e0..4f66b0f43 100644 --- a/Eigen/src/Core/arch/NEON/PacketMath.h +++ b/Eigen/src/Core/arch/NEON/PacketMath.h @@ -41,7 +41,7 @@ namespace internal { typedef float32x4_t Packet4f; typedef int32x4_t Packet4i; -typedef uint32x4_t Packet4ui; +typedef uint32x4_t Packet4ui; #define _EIGEN_DECLARE_CONST_Packet4f(NAME,X) \ const Packet4f p4f_##NAME = pset1(X) @@ -84,8 +84,8 @@ template<> struct packet_traits : default_packet_traits }; }; -#if (defined __GNUC__) && (!(EIGEN_GNUC_AT_LEAST(4,4))) -// workaround gcc 4.2 and 4.3 compilatin issue +#if EIGEN_GNUC_AT_MOST(4,4) +// workaround gcc 4.2, 4.3 and 4.4 compilatin issue EIGEN_STRONG_INLINE float32x4_t vld1q_f32(const float* x) { return ::vld1q_f32((const float32_t*)x); } EIGEN_STRONG_INLINE float32x2_t vld1_f32 (const float* x) { return ::vld1_f32 ((const float32_t*)x); } EIGEN_STRONG_INLINE void vst1q_f32(float* to, float32x4_t from) { ::vst1q_f32((float32_t*)to,from); }