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/Core/SolveTriangular.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/Core/SolveTriangular.h')
| -rw-r--r-- | Eigen/src/Core/SolveTriangular.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/SolveTriangular.h b/Eigen/src/Core/SolveTriangular.h index 0b9d3db9d..abbf57553 100644 --- a/Eigen/src/Core/SolveTriangular.h +++ b/Eigen/src/Core/SolveTriangular.h @@ -256,11 +256,11 @@ void TriangularView<MatrixType,Mode>::solveInPlace(const MatrixBase<OtherDerived eigen_assert(Mode & (Upper|Lower)); enum { copy = internal::traits<OtherDerived>::Flags & RowMajorBit && OtherDerived::IsVectorAtCompileTime }; - typedef typename internal::meta_if<copy, - typename internal::plain_matrix_type_column_major<OtherDerived>::type, OtherDerived&>::ret OtherCopy; + typedef typename internal::conditional<copy, + typename internal::plain_matrix_type_column_major<OtherDerived>::type, OtherDerived&>::type OtherCopy; OtherCopy otherCopy(other); - internal::triangular_solver_selector<MatrixType, typename internal::unref<OtherCopy>::type, + internal::triangular_solver_selector<MatrixType, typename internal::remove_reference<OtherCopy>::type, Side, Mode>::run(nestedExpression(), otherCopy); if (copy) |