diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-08-01 16:24:23 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-08-01 16:24:23 +0200 |
| commit | 107bb308c376a5a4b7f11f2792396d2fa0d12904 (patch) | |
| tree | 740774ba970ef80ea9a0e4dc877faedc1fad244a /Eigen/src/SparseCore | |
| parent | c2ff44cbf3c58045a38120d28316a992c0cc0d57 (diff) | |
Fix various small issues detected by gcc
Diffstat (limited to 'Eigen/src/SparseCore')
| -rw-r--r-- | Eigen/src/SparseCore/SparseBlock.h | 6 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseTriangularView.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index 39e636437..21445b645 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -577,7 +577,7 @@ namespace internal { #ifdef EIGEN_TEST_EVALUATORS
//
-template<typename ArgType, int BlockRows, int BlockCols, int InnerPanel>
+template<typename ArgType, int BlockRows, int BlockCols, bool InnerPanel>
struct unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBased >
: public evaluator_base<Block<ArgType,BlockRows,BlockCols,InnerPanel> >
{
@@ -615,7 +615,7 @@ struct unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBa const XprType &m_block;
};
-template<typename ArgType, int BlockRows, int BlockCols, int InnerPanel>
+template<typename ArgType, int BlockRows, int BlockCols, bool InnerPanel>
class unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBased>::InnerVectorInnerIterator
: public EvalIterator
{
@@ -640,7 +640,7 @@ public: inline operator bool() const { return EvalIterator::operator bool() && EvalIterator::index() < m_end; }
};
-template<typename ArgType, int BlockRows, int BlockCols, int InnerPanel>
+template<typename ArgType, int BlockRows, int BlockCols, bool InnerPanel>
class unary_evaluator<Block<ArgType,BlockRows,BlockCols,InnerPanel>, IteratorBased>::OuterVectorInnerIterator
{
const unary_evaluator& m_eval;
diff --git a/Eigen/src/SparseCore/SparseTriangularView.h b/Eigen/src/SparseCore/SparseTriangularView.h index 7586a0a6e..87f4ab18d 100644 --- a/Eigen/src/SparseCore/SparseTriangularView.h +++ b/Eigen/src/SparseCore/SparseTriangularView.h @@ -200,7 +200,7 @@ public: public: EIGEN_STRONG_INLINE InnerIterator(const unary_evaluator& xprEval, Index outer) - : Base(xprEval.m_argImpl,outer) + : Base(xprEval.m_argImpl,outer), m_returnOne(false) { if(SkipFirst) { |