diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-06-06 15:11:41 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-06-06 15:11:41 +0200 |
commit | 66e99ab6a1444d8e3d47211e4540837e6b982a3a (patch) | |
tree | 8435cfab07d5c788df3533569c3c29a0f8be4ba5 /Eigen/src/plugins/CommonCwiseUnaryOps.h | |
parent | 1f1e0b9e30a175c7a3197ffc87898404dda7c45e (diff) |
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
Diffstat (limited to 'Eigen/src/plugins/CommonCwiseUnaryOps.h')
-rw-r--r-- | Eigen/src/plugins/CommonCwiseUnaryOps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/plugins/CommonCwiseUnaryOps.h b/Eigen/src/plugins/CommonCwiseUnaryOps.h index 67ec601b9..927167aff 100644 --- a/Eigen/src/plugins/CommonCwiseUnaryOps.h +++ b/Eigen/src/plugins/CommonCwiseUnaryOps.h @@ -73,7 +73,7 @@ operator/(const Scalar& scalar) const /** Overloaded for efficiently multipling with compatible scalar types */ template <typename T> EIGEN_DEVICE_FUNC inline -typename internal::enable_if<internal::scalar_product_traits<T,Scalar>::Defined, +typename internal::enable_if<ScalarBinaryOpTraits<T,Scalar>::Defined, const CwiseUnaryOp<internal::scalar_multiple2_op<Scalar,T>, const Derived> >::type operator*(const T& scalar) const { @@ -91,7 +91,7 @@ operator*(const Scalar& scalar, const StorageBaseType& matrix) template <typename T> EIGEN_DEVICE_FUNC inline friend -typename internal::enable_if<internal::scalar_product_traits<Scalar,T>::Defined, +typename internal::enable_if<ScalarBinaryOpTraits<Scalar,T>::Defined, const CwiseUnaryOp<internal::scalar_multiple2_op<Scalar,T>, const Derived> >::type operator*(const T& scalar, const StorageBaseType& matrix) { @@ -104,7 +104,7 @@ operator*(const T& scalar, const StorageBaseType& matrix) template <typename T> EIGEN_DEVICE_FUNC inline -typename internal::enable_if<internal::scalar_product_traits<Scalar,T>::Defined, +typename internal::enable_if<ScalarBinaryOpTraits<Scalar,T>::Defined, const CwiseUnaryOp<internal::scalar_quotient2_op<Scalar,T>, const Derived> >::type operator/(const T& scalar) const { |