fix bad mat * mat * scalar when the implicit conversion operator to a Matrix is used

This commit is contained in:
Gael Guennebaud
2010-08-31 09:54:38 +02:00
parent dd94f10442
commit b49dde01dc
2 changed files with 7 additions and 2 deletions

View File

@@ -125,7 +125,7 @@ class ProductBase : public MatrixBase<Derived>
operator const PlainObject& () const
{
m_result.resize(m_lhs.rows(), m_rhs.cols());
this->evalTo(m_result);
derived().evalTo(m_result);
return m_result;
}
@@ -216,6 +216,7 @@ class ScaledProduct
typename NestedProduct::_LhsNested,
typename NestedProduct::_RhsNested> Base;
typedef typename Base::Scalar Scalar;
typedef typename Base::PlainObject PlainObject;
// EIGEN_PRODUCT_PUBLIC_INTERFACE(ScaledProduct)
ScaledProduct(const NestedProduct& prod, Scalar x)
@@ -232,7 +233,7 @@ class ScaledProduct
template<typename Dest>
inline void scaleAndAddTo(Dest& dst,Scalar alpha) const { m_prod.derived().scaleAndAddTo(dst,alpha); }
protected:
const NestedProduct& m_prod;
Scalar m_alpha;