diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-02-16 14:46:51 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-16 14:46:51 +0100 |
| commit | cc641aabb710ab002b6c641bd5c3e1deed0e634d (patch) | |
| tree | 8ab59ad6c92a748e0be90908d8afe36bd5e35805 /Eigen/src/SVD/UpperBidiagonalization.h | |
| parent | aa6c516ec17fb44dff85b1abf3a1b05d58d3bc01 (diff) | |
Remove deprecated usage of expr::Index.
Diffstat (limited to 'Eigen/src/SVD/UpperBidiagonalization.h')
| -rw-r--r-- | Eigen/src/SVD/UpperBidiagonalization.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Eigen/src/SVD/UpperBidiagonalization.h b/Eigen/src/SVD/UpperBidiagonalization.h index eaa6bb86e..9dc470fd9 100644 --- a/Eigen/src/SVD/UpperBidiagonalization.h +++ b/Eigen/src/SVD/UpperBidiagonalization.h @@ -29,7 +29,7 @@ template<typename _MatrixType> class UpperBidiagonalization }; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; - typedef typename MatrixType::Index Index; + typedef Eigen::Index Index; ///< \deprecated since Eigen 3.3 typedef Matrix<Scalar, 1, ColsAtCompileTime> RowVectorType; typedef Matrix<Scalar, RowsAtCompileTime, 1> ColVectorType; typedef BandMatrix<RealScalar, ColsAtCompileTime, ColsAtCompileTime, 1, 0, RowMajor> BidiagonalType; @@ -95,7 +95,6 @@ void upperbidiagonalization_inplace_unblocked(MatrixType& mat, typename MatrixType::RealScalar *upper_diagonal, typename MatrixType::Scalar* tempData = 0) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = mat.rows(); @@ -153,13 +152,12 @@ template<typename MatrixType> void upperbidiagonalization_blocked_helper(MatrixType& A, typename MatrixType::RealScalar *diagonal, typename MatrixType::RealScalar *upper_diagonal, - typename MatrixType::Index bs, + Index bs, Ref<Matrix<typename MatrixType::Scalar, Dynamic, Dynamic, traits<MatrixType>::Flags & RowMajorBit> > X, Ref<Matrix<typename MatrixType::Scalar, Dynamic, Dynamic, traits<MatrixType>::Flags & RowMajorBit> > Y) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; enum { StorageOrder = traits<MatrixType>::Flags & RowMajorBit }; typedef InnerStride<int(StorageOrder) == int(ColMajor) ? 1 : Dynamic> ColInnerStride; @@ -282,10 +280,9 @@ void upperbidiagonalization_blocked_helper(MatrixType& A, */ template<typename MatrixType, typename BidiagType> void upperbidiagonalization_inplace_blocked(MatrixType& A, BidiagType& bidiagonal, - typename MatrixType::Index maxBlockSize=32, + Index maxBlockSize=32, typename MatrixType::Scalar* /*tempData*/ = 0) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Block<MatrixType,Dynamic,Dynamic> BlockType; |