diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2010-10-25 22:13:49 +0200 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2010-10-25 22:13:49 +0200 |
| commit | 7bc8e3ac0917cdc14015e00e8b29ac299b2b772a (patch) | |
| tree | 8c6af03e1d27e0e035bc4bd9be042f78384d10e1 /Eigen/src/Householder/HouseholderSequence.h | |
| parent | 597b2745e1cfe1bf1cc4c4c189ecd16d2a0c1738 (diff) | |
Initial fixes for bug #85.
Renamed meta_{true|false} to {true|false}_type, meta_if to conditional, is_same_type to is_same, un{ref|pointer|const} to remove_{reference|pointer|const} and makeconst to add_const.
Changed boolean type 'ret' member to 'value'.
Changed 'ret' members refering to types to 'type'.
Adapted all code occurences.
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 |