diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2019-10-08 09:15:17 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2019-10-08 09:15:17 +0200 |
| commit | 87427d2eaa90bbc1c12eedecca95554d93c3c212 (patch) | |
| tree | 80afa4fb6964154d46e42b877b2888122bbec70d /Eigen/src/Core/products | |
| parent | 7a43af1a335da2c0489b4119a33ee1cbff0c15d6 (diff) | |
PR 719: fix real/imag namespace conflict
Diffstat (limited to 'Eigen/src/Core/products')
| -rw-r--r-- | Eigen/src/Core/products/GeneralBlockPanelKernel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/Eigen/src/Core/products/GeneralBlockPanelKernel.h index 6c1d882fd..2ae8ece98 100644 --- a/Eigen/src/Core/products/GeneralBlockPanelKernel.h +++ b/Eigen/src/Core/products/GeneralBlockPanelKernel.h @@ -729,8 +729,8 @@ template<typename Scalar, typename RealPacket> void loadQuadToDoublePacket(const Scalar* b, DoublePacket<RealPacket>& dest, typename enable_if<unpacket_traits<RealPacket>::size<=8>::type* = 0) { - dest.first = pset1<RealPacket>(real(*b)); - dest.second = pset1<RealPacket>(imag(*b)); + dest.first = pset1<RealPacket>(numext::real(*b)); + dest.second = pset1<RealPacket>(numext::imag(*b)); } template<typename Scalar, typename RealPacket> @@ -739,8 +739,8 @@ void loadQuadToDoublePacket(const Scalar* b, DoublePacket<RealPacket>& dest, { // yes, that's pretty hackish too :( typedef typename NumTraits<Scalar>::Real RealScalar; - RealScalar r[4] = {real(b[0]), real(b[0]), real(b[1]), real(b[1])}; - RealScalar i[4] = {imag(b[0]), imag(b[0]), imag(b[1]), imag(b[1])}; + RealScalar r[4] = {numext::real(b[0]), numext::real(b[0]), numext::real(b[1]), numext::real(b[1])}; + RealScalar i[4] = {numext::imag(b[0]), numext::imag(b[0]), numext::imag(b[1]), numext::imag(b[1])}; dest.first = ploadquad<RealPacket>(r); dest.second = ploadquad<RealPacket>(i); } @@ -820,8 +820,8 @@ public: template<typename RealPacketType> EIGEN_STRONG_INLINE void loadRhs(const RhsScalar* b, DoublePacket<RealPacketType>& dest) const { - dest.first = pset1<RealPacketType>(real(*b)); - dest.second = pset1<RealPacketType>(imag(*b)); + dest.first = pset1<RealPacketType>(numext::real(*b)); + dest.second = pset1<RealPacketType>(numext::imag(*b)); } EIGEN_STRONG_INLINE void loadRhs(const RhsScalar* b, RhsPacketx4& dest) const |