diff options
author | Gael Guennebaud <g.gael@free.fr> | 2014-04-22 17:00:38 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2014-04-22 17:00:38 +0200 |
commit | 934ce938869170d138b1c554f493754d42a0fa52 (patch) | |
tree | 7f008ccd03fd007b669334f6ff26e2d793fba9ef /Eigen/src/Core/products | |
parent | 5c5231ab71ba51432a24fdfd7d36a835b44805ea (diff) | |
parent | e5d0cb54a5f2a2200a4656d993c82a80f159a7c4 (diff) |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/products')
-rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h b/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h index ffa871cae..225b994d1 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h @@ -265,6 +265,8 @@ template<typename MatrixType, unsigned int UpLo> template<typename ProductDerived, typename _Lhs, typename _Rhs> TriangularView<MatrixType,UpLo>& TriangularView<MatrixType,UpLo>::assignProduct(const ProductBase<ProductDerived, _Lhs,_Rhs>& prod, const Scalar& alpha) { + eigen_assert(m_matrix.rows() == prod.rows() && m_matrix.cols() == prod.cols()); + general_product_to_triangular_selector<MatrixType, ProductDerived, UpLo, (_Lhs::ColsAtCompileTime==1) || (_Rhs::RowsAtCompileTime==1)>::run(m_matrix.const_cast_derived(), prod.derived(), alpha); return *this; |