diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2009-09-04 11:22:32 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2009-09-04 11:22:32 +0200 |
| commit | b0aa2520f120f256c00357948149b64661e54783 (patch) | |
| tree | a81cb32fdd9d9fd2104d5d06ada5192e5a59edb5 /Eigen/src/Core/ProductBase.h | |
| parent | 6902ef0824221391d159d153285f3d2142fdcd5b (diff) | |
* add real scalar * complex matrix, real matrix * complex scalar,
and complex scalar * real matrix overloads
* allows the inner and outer product specialisations to mix real and complex
Diffstat (limited to 'Eigen/src/Core/ProductBase.h')
| -rw-r--r-- | Eigen/src/Core/ProductBase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/ProductBase.h b/Eigen/src/Core/ProductBase.h index b2c4cd989..764dc4d8e 100644 --- a/Eigen/src/Core/ProductBase.h +++ b/Eigen/src/Core/ProductBase.h @@ -33,7 +33,7 @@ struct ei_traits<ProductBase<Derived,_Lhs,_Rhs> > { typedef typename ei_cleantype<_Lhs>::type Lhs; typedef typename ei_cleantype<_Rhs>::type Rhs; - typedef typename ei_traits<Lhs>::Scalar Scalar; + typedef typename ei_scalar_product_traits<typename Lhs::Scalar, typename Rhs::Scalar>::ReturnType Scalar; enum { RowsAtCompileTime = ei_traits<Lhs>::RowsAtCompileTime, ColsAtCompileTime = ei_traits<Rhs>::ColsAtCompileTime, @@ -146,7 +146,7 @@ class ScaledProduct; // functions of ProductBase, because, otherwise we would have to // define all overloads defined in MatrixBase. Furthermore, Using // "using Base::operator*" would not work with MSVC. -// +// // Also note that here we accept any compatible scalar types template<typename Derived,typename Lhs,typename Rhs> const ScaledProduct<Derived> |