diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2014-07-15 10:55:03 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2014-07-15 10:55:03 +0200 |
| commit | 3c7686630d08de89064ad7c8d0b0d619c108fb67 (patch) | |
| tree | 5484553c8b2012fb57435b314c6e627893484bcf /Eigen/src/SparseCore/SparseUtil.h | |
| parent | 296cb4016124d5c186ed65637888bb1c2c5fda2f (diff) | |
| parent | 4f440b81237a2624e4bf927b279b4a399469b28d (diff) | |
merge with default branch
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 847dfe575..6e1db0ce8 100644 --- a/Eigen/src/SparseCore/SparseUtil.h +++ b/Eigen/src/SparseCore/SparseUtil.h @@ -105,8 +105,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 { |