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/Householder/HouseholderSequence.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Eigen/src/Householder')

diff --git a/Eigen/src/Householder/HouseholderSequence.h b/Eigen/src/Householder/HouseholderSequence.h
index a57f81764..3ce0a693d 100644
--- a/Eigen/src/Householder/HouseholderSequence.h
+++ b/Eigen/src/Householder/HouseholderSequence.h
@@ -108,7 +108,7 @@ struct hseq_side_dependent_impl<VectorsType, CoeffsType, OnTheRight>
 
 template<typename OtherScalarType, typename MatrixType> struct matrix_type_times_scalar_type
 {
-  typedef typename scalar_product_traits<OtherScalarType, typename MatrixType::Scalar>::ReturnType
+  typedef typename ScalarBinaryOpTraits<OtherScalarType, typename MatrixType::Scalar>::ReturnType
     ResultScalar;
   typedef Matrix<ResultScalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime,
                  0, MatrixType::MaxRowsAtCompileTime, MatrixType::MaxColsAtCompileTime> Type;
-- 
cgit v1.2.3