diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-04-19 11:21:39 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-04-19 11:21:39 +0200 |
| commit | 9cd2d14005def8e7df0b0bf5fd6eb51f8a6591e9 (patch) | |
| tree | ca4df13b58e923bdebd9d5f59aecda9d1e30ca58 /Eigen/src/Core/CwiseBinaryOp.h | |
| parent | 4e2e615a7c2c719d2d708ab32840bad353322d8c (diff) | |
| parent | 46755648ec341aa5e0283b47456108bb2897b1b3 (diff) | |
merge with default branch
Diffstat (limited to 'Eigen/src/Core/CwiseBinaryOp.h')
| -rw-r--r-- | Eigen/src/Core/CwiseBinaryOp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/CwiseBinaryOp.h b/Eigen/src/Core/CwiseBinaryOp.h index 532b2b96e..e603fb9d6 100644 --- a/Eigen/src/Core/CwiseBinaryOp.h +++ b/Eigen/src/Core/CwiseBinaryOp.h @@ -94,8 +94,8 @@ struct traits<CwiseBinaryOp<BinaryOp, Lhs, Rhs> > // So allowing mixing different types gives very unexpected errors when enabling vectorization, when the user tries to // add together a float matrix and a double matrix. #define EIGEN_CHECK_BINARY_COMPATIBILIY(BINOP,LHS,RHS) \ - EIGEN_STATIC_ASSERT((internal::functor_allows_mixing_real_and_complex<BINOP>::ret \ - ? int(internal::is_same<typename NumTraits<LHS>::Real, typename NumTraits<RHS>::Real>::value) \ + EIGEN_STATIC_ASSERT((internal::functor_is_product_like<BINOP>::ret \ + ? int(internal::scalar_product_traits<LHS, RHS>::Defined) \ : int(internal::is_same<LHS, RHS>::value)), \ YOU_MIXED_DIFFERENT_NUMERIC_TYPES__YOU_NEED_TO_USE_THE_CAST_METHOD_OF_MATRIXBASE_TO_CAST_NUMERIC_TYPES_EXPLICITLY) |