diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-01-27 09:59:19 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-01-27 09:59:19 +0100 |
| commit | 0bfb78c8240525a8065e008efad08498d572ef81 (patch) | |
| tree | 0f899ed3e3dceb9bfc2b1d356178a83d2999510f /Eigen/src/Core/MatrixBase.h | |
| parent | fe3bb545e0a1a1cfaf36f6e25a5cc0bfb00337c6 (diff) | |
allow mixed complex-real and real-complex dot products
Diffstat (limited to 'Eigen/src/Core/MatrixBase.h')
| -rw-r--r-- | Eigen/src/Core/MatrixBase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 3b854ca5e..f318bfd5d 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -202,10 +202,11 @@ template<typename Derived> class MatrixBase #if EIGEN2_SUPPORT_STAGE != STAGE20_RESOLVE_API_CONFLICTS template<typename OtherDerived> + typename internal::scalar_product_traits<typename internal::traits<Derived>::Scalar,typename internal::traits<OtherDerived>::Scalar>::ReturnType #if EIGEN2_SUPPORT_STAGE == STAGE15_RESOLVE_API_CONFLICTS_WARN - EIGEN_DEPRECATED + EIGEN_DEPRECATED Scalar #endif - Scalar dot(const MatrixBase<OtherDerived>& other) const; + dot(const MatrixBase<OtherDerived>& other) const; #endif #ifdef EIGEN2_SUPPORT |