diff options
author | Gael Guennebaud <g.gael@free.fr> | 2016-07-18 12:03:05 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2016-07-18 12:03:05 +0200 |
commit | 79574e384e4121f9d019400d6c7a062e944cd871 (patch) | |
tree | 2e733db0cd6b21999b7ea7cba080e82b2a66d7d4 /Eigen/src/Core/util/Meta.h | |
parent | 6a3c451c1cf10bf96cd37ce0963728118d1ad3b1 (diff) |
Make scalar_product_op the default (instead of void)
Diffstat (limited to 'Eigen/src/Core/util/Meta.h')
-rwxr-xr-x | Eigen/src/Core/util/Meta.h | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/Eigen/src/Core/util/Meta.h b/Eigen/src/Core/util/Meta.h index dad0c1d56..e05b58def 100755 --- a/Eigen/src/Core/util/Meta.h +++ b/Eigen/src/Core/util/Meta.h @@ -435,67 +435,6 @@ T div_ceil(const T &a, const T &b) } // end namespace numext - -/** \class ScalarBinaryOpTraits - * \ingroup Core_Module - * - * \brief Determines whether the given binary operation of two numeric types is allowed and what the scalar return type is. - * - * \sa CwiseBinaryOp - */ -template<typename ScalarA, typename ScalarB, typename BinaryOp=void> -struct ScalarBinaryOpTraits -#ifndef EIGEN_PARSED_BY_DOXYGEN - // for backward compatibility, use the hints given by the (deprecated) internal::scalar_product_traits class. - : internal::scalar_product_traits<ScalarA,ScalarB> -#endif // EIGEN_PARSED_BY_DOXYGEN -{}; - -template<typename T, typename BinaryOp> -struct ScalarBinaryOpTraits<T,T,BinaryOp> -{ - enum { Defined = 1 }; - typedef T ReturnType; -}; - -// For Matrix * Permutation -template<typename T, typename BinaryOp> -struct ScalarBinaryOpTraits<T,void,BinaryOp> -{ - enum { Defined = 1 }; - typedef T ReturnType; -}; - -// For Permutation * Matrix -template<typename T, typename BinaryOp> -struct ScalarBinaryOpTraits<void,T,BinaryOp> -{ - enum { Defined = 1 }; - typedef T ReturnType; -}; - -// for Permutation*Permutation -template<typename BinaryOp> -struct ScalarBinaryOpTraits<void,void,BinaryOp> -{ - enum { Defined = 1 }; - typedef void ReturnType; -}; - -template<typename T, typename BinaryOp> -struct ScalarBinaryOpTraits<T,std::complex<T>,BinaryOp> -{ - enum { Defined = 1 }; - typedef std::complex<T> ReturnType; -}; - -template<typename T, typename BinaryOp> -struct ScalarBinaryOpTraits<std::complex<T>, T,BinaryOp> -{ - enum { Defined = 1 }; - typedef std::complex<T> ReturnType; -}; - } // end namespace Eigen #endif // EIGEN_META_H |