diff options
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Array/VectorwiseOp.h | 4 | ||||
| -rw-r--r-- | Eigen/src/Sparse/AmbiVector.h | 3 | ||||
| -rw-r--r-- | Eigen/src/Sparse/SparseCwiseBinaryOp.h | 1 | ||||
| -rw-r--r-- | Eigen/src/Sparse/SparseTriangularView.h | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/Eigen/src/Array/VectorwiseOp.h b/Eigen/src/Array/VectorwiseOp.h index c0944fc42..3aaaa1ec9 100644 --- a/Eigen/src/Array/VectorwiseOp.h +++ b/Eigen/src/Array/VectorwiseOp.h @@ -118,8 +118,8 @@ class PartialReduxExpr : ei_no_assignment_operator, typedef ResultType result_type; \ template<typename Scalar, int Size> struct Cost \ { enum { value = COST }; }; \ - template<typename Derived> \ - inline ResultType operator()(const DenseBase<Derived>& mat) const \ + template<typename XprType> \ + inline ResultType operator()(const XprType& mat) const \ { return mat.MEMBER(); } \ } diff --git a/Eigen/src/Sparse/AmbiVector.h b/Eigen/src/Sparse/AmbiVector.h index 2988999d6..6bb6ee3e4 100644 --- a/Eigen/src/Sparse/AmbiVector.h +++ b/Eigen/src/Sparse/AmbiVector.h @@ -303,6 +303,8 @@ class AmbiVector<_Scalar>::Iterator m_isDense = m_vector.m_mode==IsDense; if (m_isDense) { + m_currentEl = 0; // this is to avoid a compilation warning + m_cachedValue = 0; // this is to avoid a compilation warning m_cachedIndex = m_vector.m_start-1; ++(*this); } @@ -314,6 +316,7 @@ class AmbiVector<_Scalar>::Iterator m_currentEl = llElements[m_currentEl].next; if (m_currentEl<0) { + m_cachedValue = 0; // this is to avoid a compilation warning m_cachedIndex = -1; } else diff --git a/Eigen/src/Sparse/SparseCwiseBinaryOp.h b/Eigen/src/Sparse/SparseCwiseBinaryOp.h index 4f8221787..ce6efed1e 100644 --- a/Eigen/src/Sparse/SparseCwiseBinaryOp.h +++ b/Eigen/src/Sparse/SparseCwiseBinaryOp.h @@ -126,6 +126,7 @@ class ei_sparse_cwise_binary_op_inner_iterator_selector<BinaryOp, Lhs, Rhs, Deri } else { + m_value = 0; // this is to avoid a compilation warning m_id = -1; } return *static_cast<Derived*>(this); diff --git a/Eigen/src/Sparse/SparseTriangularView.h b/Eigen/src/Sparse/SparseTriangularView.h index 6a9461528..b5eb3d6bd 100644 --- a/Eigen/src/Sparse/SparseTriangularView.h +++ b/Eigen/src/Sparse/SparseTriangularView.h @@ -33,8 +33,8 @@ struct ei_traits<SparseTriangularView<MatrixType,Mode> > template<typename MatrixType, int Mode> class SparseTriangularView : public SparseMatrixBase<SparseTriangularView<MatrixType,Mode> > { - enum { SkipFirst = (Mode==LowerTriangular && (!MatrixType::Flags&RowMajorBit)) - || (Mode==UpperTriangular && ( MatrixType::Flags&RowMajorBit)) }; + enum { SkipFirst = (Mode==LowerTriangular && !(MatrixType::Flags&RowMajorBit)) + || (Mode==UpperTriangular && (MatrixType::Flags&RowMajorBit)) }; public: class InnerIterator; |