From 66e99ab6a1444d8e3d47211e4540837e6b982a3a Mon Sep 17 00:00:00 2001
From: Gael Guennebaud <g.gael@free.fr>
Date: Mon, 6 Jun 2016 15:11:41 +0200
Subject: Relax mixing-type constraints for binary coefficient-wise operators:
 - Replace internal::scalar_product_traits<A,B> by
 Eigen::ScalarBinaryOpTraits<A,B,OP> - Remove the "functor_is_product_like"
 helper (was pretty ugly) - Currently, OP is not used, but it is available to
 the user for fine grained tuning - Currently, only the following operators
 have been generalized: *,/,+,-,=,*=,/=,+=,-= - TODO: generalize all other
 binray operators (comparisons,pow,etc.) - TODO: handle "scalar op array"
 operators (currently only * is handled) - TODO: move the handling of the
 "void" scalar type to ScalarBinaryOpTraits

---
 Eigen/src/Core/DiagonalMatrix.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/Eigen/src/Core/DiagonalMatrix.h b/Eigen/src/Core/DiagonalMatrix.h
index 5a9e3abd4..aa619dd5c 100644
--- a/Eigen/src/Core/DiagonalMatrix.h
+++ b/Eigen/src/Core/DiagonalMatrix.h
@@ -320,16 +320,16 @@ template<> struct AssignmentKind<DenseShape,DiagonalShape> { typedef Diagonal2De
 template< typename DstXprType, typename SrcXprType, typename Functor, typename Scalar>
 struct Assignment<DstXprType, SrcXprType, Functor, Diagonal2Dense, Scalar>
 {
-  static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<typename DstXprType::Scalar> &/*func*/)
+  static void run(DstXprType &dst, const SrcXprType &src, const internal::assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar> &/*func*/)
   {
     dst.setZero();
     dst.diagonal() = src.diagonal();
   }
   
-  static void run(DstXprType &dst, const SrcXprType &src, const internal::add_assign_op<typename DstXprType::Scalar> &/*func*/)
+  static void run(DstXprType &dst, const SrcXprType &src, const internal::add_assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar> &/*func*/)
   { dst.diagonal() += src.diagonal(); }
   
-  static void run(DstXprType &dst, const SrcXprType &src, const internal::sub_assign_op<typename DstXprType::Scalar> &/*func*/)
+  static void run(DstXprType &dst, const SrcXprType &src, const internal::sub_assign_op<typename DstXprType::Scalar,typename SrcXprType::Scalar> &/*func*/)
   { dst.diagonal() -= src.diagonal(); }
 };
 
-- 
cgit v1.2.3