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/Product.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h
index 8aa1de081..bad289761 100644
--- a/Eigen/src/Core/Product.h
+++ b/Eigen/src/Core/Product.h
@@ -18,11 +18,12 @@ namespace internal {
 
 // Determine the scalar of Product<Lhs, Rhs>. This is normally the same as Lhs::Scalar times
 // Rhs::Scalar, but product with permutation matrices inherit the scalar of the other factor.
+// TODO: this could be removed once ScalarBinaryOpTraits handles void.
 template<typename Lhs, typename Rhs, typename LhsShape = typename evaluator_traits<Lhs>::Shape, 
          typename RhsShape = typename evaluator_traits<Rhs>::Shape >
 struct product_result_scalar
 {
-  typedef typename scalar_product_traits<typename Lhs::Scalar, typename Rhs::Scalar>::ReturnType Scalar;
+  typedef typename ScalarBinaryOpTraits<typename Lhs::Scalar, typename Rhs::Scalar>::ReturnType Scalar;
 };
 
 template<typename Lhs, typename Rhs, typename RhsShape>
-- 
cgit v1.2.3