aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/Core/Product.h
diff options
context:
space:
mode:
Diffstat (limited to 'Eigen/src/Core/Product.h')
-rw-r--r--Eigen/src/Core/Product.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index a1ec6b8d2..f8b173bcf 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -82,7 +82,10 @@ struct ei_traits<Product<Lhs, Rhs, EvalMode> >
RowsAtCompileTime = Lhs::RowsAtCompileTime,
ColsAtCompileTime = Rhs::ColsAtCompileTime,
MaxRowsAtCompileTime = Lhs::MaxRowsAtCompileTime,
- MaxColsAtCompileTime = Rhs::MaxColsAtCompileTime
+ MaxColsAtCompileTime = Rhs::MaxColsAtCompileTime,
+ Flags = (RowsAtCompileTime == Dynamic || ColsAtCompileTime == Dynamic)
+ ? (unsigned int)(Lhs::Flags | Rhs::Flags)
+ : (unsigned int)(Lhs::Flags | Rhs::Flags) & ~Large
};
};
@@ -120,7 +123,7 @@ template<typename Lhs, typename Rhs, int EvalMode> class Product : ei_no_assignm
int _rows() const { return m_lhs.rows(); }
int _cols() const { return m_rhs.cols(); }
- Scalar _coeff(int row, int col) const
+ const Scalar _coeff(int row, int col) const
{
Scalar res;
if(EIGEN_UNROLLED_LOOPS