diff options
Diffstat (limited to 'Eigen/src/Core/products/GeneralMatrixVector.h')
-rw-r--r-- | Eigen/src/Core/products/GeneralMatrixVector.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixVector.h b/Eigen/src/Core/products/GeneralMatrixVector.h index 41df6170c..540638b5a 100644 --- a/Eigen/src/Core/products/GeneralMatrixVector.h +++ b/Eigen/src/Core/products/GeneralMatrixVector.h @@ -57,9 +57,9 @@ typedef typename packet_traits<LhsScalar>::type _LhsPacket; typedef typename packet_traits<RhsScalar>::type _RhsPacket; typedef typename packet_traits<ResScalar>::type _ResPacket; -typedef typename meta_if<Vectorizable,_LhsPacket,LhsScalar>::ret LhsPacket; -typedef typename meta_if<Vectorizable,_RhsPacket,RhsScalar>::ret RhsPacket; -typedef typename meta_if<Vectorizable,_ResPacket,ResScalar>::ret ResPacket; +typedef typename conditional<Vectorizable,_LhsPacket,LhsScalar>::type LhsPacket; +typedef typename conditional<Vectorizable,_RhsPacket,RhsScalar>::type RhsPacket; +typedef typename conditional<Vectorizable,_ResPacket,ResScalar>::type ResPacket; EIGEN_DONT_INLINE static void run( Index rows, Index cols, @@ -313,9 +313,9 @@ typedef typename packet_traits<LhsScalar>::type _LhsPacket; typedef typename packet_traits<RhsScalar>::type _RhsPacket; typedef typename packet_traits<ResScalar>::type _ResPacket; -typedef typename meta_if<Vectorizable,_LhsPacket,LhsScalar>::ret LhsPacket; -typedef typename meta_if<Vectorizable,_RhsPacket,RhsScalar>::ret RhsPacket; -typedef typename meta_if<Vectorizable,_ResPacket,ResScalar>::ret ResPacket; +typedef typename conditional<Vectorizable,_LhsPacket,LhsScalar>::type LhsPacket; +typedef typename conditional<Vectorizable,_RhsPacket,RhsScalar>::type RhsPacket; +typedef typename conditional<Vectorizable,_ResPacket,ResScalar>::type ResPacket; EIGEN_DONT_INLINE static void run( Index rows, Index cols, |