diff options
Diffstat (limited to 'Eigen/src/Householder/HouseholderSequence.h')
| -rw-r--r-- | Eigen/src/Householder/HouseholderSequence.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Householder/HouseholderSequence.h b/Eigen/src/Householder/HouseholderSequence.h index b9be94093..ef4c0ca79 100644 --- a/Eigen/src/Householder/HouseholderSequence.h +++ b/Eigen/src/Householder/HouseholderSequence.h @@ -123,9 +123,9 @@ template<typename VectorsType, typename CoeffsType, int Side> class HouseholderS typedef HouseholderSequence< VectorsType, - typename internal::meta_if<NumTraits<Scalar>::IsComplex, + typename internal::conditional<NumTraits<Scalar>::IsComplex, typename internal::cleantype<typename CoeffsType::ConjugateReturnType>::type, - CoeffsType>::ret, + CoeffsType>::type, Side > ConjugateReturnType; @@ -167,7 +167,7 @@ template<typename VectorsType, typename CoeffsType, int Side> class HouseholderS // FIXME find a way to pass this temporary if the user want to Matrix<Scalar, DestType::RowsAtCompileTime, 1, AutoAlign|ColMajor, DestType::MaxRowsAtCompileTime, 1> temp(rows()); - if( internal::is_same_type<typename internal::cleantype<VectorsType>::type,DestType>::ret + if( internal::is_same<typename internal::cleantype<VectorsType>::type,DestType>::value && internal::extract_data(dst) == internal::extract_data(m_vectors)) { // in-place |