diff --git a/.hgignore b/.hgignore index 58b396687..5845f20cf 100644 --- a/.hgignore +++ b/.hgignore @@ -5,6 +5,7 @@ qrc_*cxx *.diff diff *.save +save *.old *.gmo *.qm diff --git a/Eigen/src/Sparse/SparseLU.h b/Eigen/src/Sparse/SparseLU.h index 3fe9df1ef..0211b78e2 100644 --- a/Eigen/src/Sparse/SparseLU.h +++ b/Eigen/src/Sparse/SparseLU.h @@ -102,7 +102,7 @@ class SparseLU void setOrderingMethod(int m) { - ei_assert(m&~OrderingMask == 0 && m!=0 && "invalid ordering method"); + ei_assert( (m&~OrderingMask) == 0 && m!=0 && "invalid ordering method"); m_flags = m_flags&~OrderingMask | m&OrderingMask; } @@ -138,7 +138,7 @@ class SparseLU * using the default algorithm. */ template -void SparseLU::compute(const MatrixType& a) +void SparseLU::compute(const MatrixType& ) { ei_assert(false && "not implemented yet"); } @@ -153,7 +153,7 @@ void SparseLU::compute(const MatrixType& a) */ template template -bool SparseLU::solve(const MatrixBase &b, MatrixBase* x, const int transposed) const +bool SparseLU::solve(const MatrixBase &, MatrixBase* , const int ) const { ei_assert(false && "not implemented yet"); return false; diff --git a/Eigen/src/Sparse/SparseProduct.h b/Eigen/src/Sparse/SparseProduct.h index 4499e88be..078ac5f48 100644 --- a/Eigen/src/Sparse/SparseProduct.h +++ b/Eigen/src/Sparse/SparseProduct.h @@ -156,8 +156,8 @@ static void ei_sparse_product_impl2(const Lhs& lhs, const Rhs& rhs, ResultType& float avgNnzPerRhsColumn = float(rhs.nonZeros())/float(cols); float ratioRes = std::min(ratioLhs * avgNnzPerRhsColumn, 1.f); - int t200 = rows/(log2(200)*1.39); - int t = (rows*100)/139; +// int t200 = rows/(log2(200)*1.39); +// int t = (rows*100)/139; res.resize(rows, cols); res.reserve(int(ratioRes*rows*cols)); @@ -377,6 +377,11 @@ struct ei_sparse_product_selector2 RowMajorMatrix; // RowMajorMatrix rhsRow = rhs; // RowMajorMatrix resRow(res.rows(), res.cols()); diff --git a/Eigen/src/Sparse/SparseSelfAdjointView.h b/Eigen/src/Sparse/SparseSelfAdjointView.h index 8496612d0..d47705337 100644 --- a/Eigen/src/Sparse/SparseSelfAdjointView.h +++ b/Eigen/src/Sparse/SparseSelfAdjointView.h @@ -214,7 +214,7 @@ class DenseTimeSparseSelfAdjointProduct DenseTimeSparseSelfAdjointProduct(const Lhs& lhs, const Rhs& rhs) : Base(lhs,rhs) {} - template void scaleAndAddTo(Dest& dest, Scalar alpha) const + template void scaleAndAddTo(Dest& /*dest*/, Scalar /*alpha*/) const { // TODO } diff --git a/Eigen/src/Sparse/SparseUtil.h b/Eigen/src/Sparse/SparseUtil.h index b051b6818..782690b26 100644 --- a/Eigen/src/Sparse/SparseUtil.h +++ b/Eigen/src/Sparse/SparseUtil.h @@ -144,7 +144,7 @@ const int InnerRandomAccessPattern = 0x2 | CoherentAccessPattern; const int OuterRandomAccessPattern = 0x4 | CoherentAccessPattern; const int RandomAccessPattern = 0x8 | OuterRandomAccessPattern | InnerRandomAccessPattern; -template class ei_eval +template struct ei_eval { typedef typename ei_traits::Scalar _Scalar; enum { diff --git a/Eigen/src/Sparse/SparseVector.h b/Eigen/src/Sparse/SparseVector.h index d328312d0..6806ab288 100644 --- a/Eigen/src/Sparse/SparseVector.h +++ b/Eigen/src/Sparse/SparseVector.h @@ -379,7 +379,7 @@ class SparseVector::InnerIterator {} template - InnerIterator(const Flagged& vec, int outer) + InnerIterator(const Flagged& vec, int ) : m_data(vec._expression().m_data), m_id(0), m_end(m_data.size()) {}