diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-07-11 17:15:26 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-07-11 17:15:26 +0200 |
| commit | a20e2462bf760fa87d7228d42fac88c188da5a6d (patch) | |
| tree | 1cbbb8640d7c67d49610f39084d6896f880c4ae2 /Eigen/src/SparseCore/SparseUtil.h | |
| parent | c0f76ce2cf1780c7b638071d45cba2a3d04f2f6f (diff) | |
Fix bug #838: detect outer products from either the lhs or rhs
Diffstat (limited to 'Eigen/src/SparseCore/SparseUtil.h')
| -rw-r--r-- | Eigen/src/SparseCore/SparseUtil.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Eigen/src/SparseCore/SparseUtil.h b/Eigen/src/SparseCore/SparseUtil.h index 05023858b..02c19d18f 100644 --- a/Eigen/src/SparseCore/SparseUtil.h +++ b/Eigen/src/SparseCore/SparseUtil.h @@ -84,8 +84,11 @@ template<typename Lhs, typename Rhs> class DenseTimeSparseProduct; template<typename Lhs, typename Rhs, bool Transpose> class SparseDenseOuterProduct; template<typename Lhs, typename Rhs> struct SparseSparseProductReturnType; -template<typename Lhs, typename Rhs, int InnerSize = internal::traits<Lhs>::ColsAtCompileTime> struct DenseSparseProductReturnType; -template<typename Lhs, typename Rhs, int InnerSize = internal::traits<Lhs>::ColsAtCompileTime> struct SparseDenseProductReturnType; +template<typename Lhs, typename Rhs, + int InnerSize = EIGEN_SIZE_MIN_PREFER_FIXED(internal::traits<Lhs>::ColsAtCompileTime,internal::traits<Rhs>::RowsAtCompileTime)> struct DenseSparseProductReturnType; + +template<typename Lhs, typename Rhs, + int InnerSize = EIGEN_SIZE_MIN_PREFER_FIXED(internal::traits<Lhs>::ColsAtCompileTime,internal::traits<Rhs>::RowsAtCompileTime)> struct SparseDenseProductReturnType; template<typename MatrixType,int UpLo> class SparseSymmetricPermutationProduct; namespace internal { |