diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-03-18 12:58:08 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2014-03-18 12:58:08 -0700 |
| commit | 8a0845ebd726182fb9454f8874307290f8e09164 (patch) | |
| tree | 509d391ac518c0c45f8dfb5c6569e90d55d5d619 /Eigen/src/SparseCore | |
| parent | 8eac97138ae49f386865b760ec8b12a5d6fd1891 (diff) | |
| parent | 3e42b775ead02a2b389840b1b8fd7c28121fb387 (diff) | |
Merged latest changes from the parent
Diffstat (limited to 'Eigen/src/SparseCore')
| -rw-r--r-- | Eigen/src/SparseCore/SparseBlock.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h index 6f615e250..5b95cc33f 100644 --- a/Eigen/src/SparseCore/SparseBlock.h +++ b/Eigen/src/SparseCore/SparseBlock.h @@ -338,7 +338,10 @@ const Block<const Derived,Dynamic,Dynamic,true> SparseMatrixBase<Derived>::inner namespace internal {
template< typename XprType, int BlockRows, int BlockCols, bool InnerPanel,
- bool OuterVector = (BlockCols==1 && XprType::IsRowMajor) || (BlockRows==1 && !XprType::IsRowMajor)>
+ bool OuterVector = (BlockCols==1 && XprType::IsRowMajor)
+ | // FIXME | instead of || to please GCC 4.4.0 stupid warning "suggest parentheses around &&".
+ // revert to || as soon as not needed anymore.
+ (BlockRows==1 && !XprType::IsRowMajor)>
class GenericSparseBlockInnerIteratorImpl;
}
|