From 5539587b1f5b5922b2419b0a4468cf2f393def51 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 17 Jul 2018 10:29:12 +0200 Subject: [PATCH] Some warning fixes --- Eigen/src/Householder/HouseholderSequence.h | 2 +- Eigen/src/SparseLU/SparseLU.h | 3 --- unsupported/Eigen/src/IterativeSolvers/DGMRES.h | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Eigen/src/Householder/HouseholderSequence.h b/Eigen/src/Householder/HouseholderSequence.h index af19701a4..e62befcb6 100644 --- a/Eigen/src/Householder/HouseholderSequence.h +++ b/Eigen/src/Householder/HouseholderSequence.h @@ -356,7 +356,7 @@ template class HouseholderS if(m_length>=BlockSize && dst.cols()>1) { // Make sure we have at least 2 useful blocks, otherwise it is point-less: - Index blockSize = m_length<2*BlockSize ? (m_length+1)/2 : BlockSize; + Index blockSize = m_length::factorize(const MatrixType& matrix) eigen_assert(m_analysisIsOk && "analyzePattern() should be called first"); eigen_assert((matrix.rows() == matrix.cols()) && "Only for squared matrices"); - typedef typename IndexVector::Scalar StorageIndex; - m_isInitialized = true; - // Apply the column permutation computed in analyzepattern() // m_mat = matrix * m_perm_c.inverse(); m_mat = matrix; diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h index be039e07f..85a4f696c 100644 --- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h +++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h @@ -392,7 +392,6 @@ inline typename DGMRES<_MatrixType, _Preconditioner>::ComplexVector DGMRES<_Matr template< typename _MatrixType, typename _Preconditioner> inline typename DGMRES<_MatrixType, _Preconditioner>::ComplexVector DGMRES<_MatrixType, _Preconditioner>::schurValues(const RealSchur& schurofH) const { - typedef typename MatrixType::Index Index; const DenseMatrix& T = schurofH.matrixT(); Index it = T.rows(); ComplexVector eig(it);