From 64fcfd314f594bbc358aa8e2b8dc8def9b288b66 Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Tue, 14 Jun 2016 11:26:57 +0200
Subject: Implement scalar multiples and division by a scalar as a
 binary-expression with a constant expression. This slightly complexifies the
 type of the expressions and implies that we now have to distinguish between
 scalar*expr and expr*scalar to catch scalar-multiple expression (e.g., see
 BlasUtil.h), but this brings several advantages: - it makes it clear on each
 side the scalar is applied, - it clearly reflects that we are dealing with a
 binary-expression, - the complexity of the type is hidden through macros
 defined at the end of Macros.h, - distinguishing between "scalar op expr" and
 "expr op scalar" is important to support non commutative fields (like
 quaternions) - "scalar op expr" is now fully equivalent to
 "ConstantExpr(scalar) op expr" - scalar_multiple_op, scalar_quotient1_op and
 scalar_quotient2_op are not used anymore in officially supported modules
 (still used in Tensor)

---
 Eigen/src/Core/DiagonalMatrix.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'Eigen/src/Core/DiagonalMatrix.h')

diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index aa619dd5c..d6f89bced 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -71,18 +71,17 @@ class DiagonalBase : public EigenBase<Derived>
       return InverseReturnType(diagonal().cwiseInverse());
     }
     
-    typedef DiagonalWrapper<const CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DiagonalVectorType> > ScalarMultipleReturnType;
     EIGEN_DEVICE_FUNC
-    inline const ScalarMultipleReturnType
+    inline const DiagonalWrapper<const EIGEN_EXPR_BINARYOP_SCALAR_RETURN_TYPE(DiagonalVectorType,Scalar,product) >
     operator*(const Scalar& scalar) const
     {
-      return ScalarMultipleReturnType(diagonal() * scalar);
+      return DiagonalWrapper<const EIGEN_EXPR_BINARYOP_SCALAR_RETURN_TYPE(DiagonalVectorType,Scalar,product) >(diagonal() * scalar);
     }
     EIGEN_DEVICE_FUNC
-    friend inline const ScalarMultipleReturnType
+    friend inline const DiagonalWrapper<const EIGEN_SCALAR_BINARYOP_EXPR_RETURN_TYPE(Scalar,DiagonalVectorType,product) >
     operator*(const Scalar& scalar, const DiagonalBase& other)
     {
-      return ScalarMultipleReturnType(other.diagonal() * scalar);
+      return DiagonalWrapper<const EIGEN_SCALAR_BINARYOP_EXPR_RETURN_TYPE(Scalar,DiagonalVectorType,product) >(scalar * other.diagonal());
     }
 };
 
-- 
cgit v1.2.3