diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-07-17 10:29:12 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-07-17 10:29:12 +0200 |
| commit | 5539587b1f5b5922b2419b0a4468cf2f393def51 (patch) | |
| tree | bb7af2f075c240790bd1eb255f5ee5a39611f566 | |
| parent | 40797dbea334405fb49ea1ba2cd972a23a7dbe02 (diff) | |
Some warning fixes
| -rw-r--r-- | Eigen/src/Householder/HouseholderSequence.h | 2 | ||||
| -rw-r--r-- | Eigen/src/SparseLU/SparseLU.h | 3 | ||||
| -rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/DGMRES.h | 1 |
3 files changed, 1 insertions, 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<typename VectorsType, typename CoeffsType, int Side> 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<Index(2*BlockSize) ? (m_length+1)/2 : Index(BlockSize); for(Index i = 0; i < m_length; i+=blockSize) { Index end = m_reverse ? (std::min)(m_length,i+blockSize) : m_length-i; diff --git a/Eigen/src/SparseLU/SparseLU.h b/Eigen/src/SparseLU/SparseLU.h index 5d2419353..91b6369ac 100644 --- a/Eigen/src/SparseLU/SparseLU.h +++ b/Eigen/src/SparseLU/SparseLU.h @@ -499,11 +499,8 @@ void SparseLU<MatrixType, OrderingType>::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<DenseMatrix>& schurofH) const { - typedef typename MatrixType::Index Index; const DenseMatrix& T = schurofH.matrixT(); Index it = T.rows(); ComplexVector eig(it); |