diff options
author | Gael Guennebaud <g.gael@free.fr> | 2015-02-17 16:08:07 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-17 16:08:07 +0100 |
commit | 91ab2489dde3f274a2ff65741e7bda89a5487cb0 (patch) | |
tree | dfb3f4ed01318e110fb3393dcae35659d446fa30 | |
parent | 9daf8eba6f02555ea1e0dee0fbbcadbeab985f0d (diff) |
Fix compilation with GCC/AVX (workaround __m128 and __m256 being the same type with default ABI)
-rw-r--r-- | Eigen/src/Core/arch/SSE/Complex.h | 2 | ||||
-rwxr-xr-x | Eigen/src/Core/arch/SSE/PacketMath.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/arch/SSE/Complex.h b/Eigen/src/Core/arch/SSE/Complex.h index acb49abf8..3713b73da 100644 --- a/Eigen/src/Core/arch/SSE/Complex.h +++ b/Eigen/src/Core/arch/SSE/Complex.h @@ -474,7 +474,7 @@ ptranspose(PacketBlock<Packet2cf,2>& kernel) { } template<> EIGEN_STRONG_INLINE Packet2cf pblend(const Selector<2>& ifPacket, const Packet2cf& thenPacket, const Packet2cf& elsePacket) { - __m128d result = pblend(ifPacket, _mm_castps_pd(thenPacket.v), _mm_castps_pd(elsePacket.v)); + __m128d result = pblend<Packet2d>(ifPacket, _mm_castps_pd(thenPacket.v), _mm_castps_pd(elsePacket.v)); return Packet2cf(_mm_castpd_ps(result)); } diff --git a/Eigen/src/Core/arch/SSE/PacketMath.h b/Eigen/src/Core/arch/SSE/PacketMath.h index 86d94dffa..acbbd0869 100755 --- a/Eigen/src/Core/arch/SSE/PacketMath.h +++ b/Eigen/src/Core/arch/SSE/PacketMath.h @@ -34,7 +34,7 @@ namespace internal { // One solution is to increase ABI version using -fabi-version=4 (or greater). // To workaround this inconvenince, we rather wrap 128bit types into the following helper // structure: -// TODO disable this wrapper if abi-versio>=4, but to detect that without asking the user to define a macro? +// TODO disable this wrapper if abi-versio>=4, but how to detect that without asking the user to define a macro? template<typename T> struct eigen_packet_wrapper { |