diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-02-19 23:30:41 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-02-19 23:30:41 +0100 |
| commit | 1b7e12847d099ab6715c3ee99f068c9fd19858fc (patch) | |
| tree | f07f6e3966772ff75152d3bc830fa0488f54e532 /Eigen | |
| parent | 0f4dd15dfc6e18e88cc55f561cf4ee2a772ab350 (diff) | |
Fix some calls to result_of on binary functors as unary ones.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/Redux.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Core/VectorwiseOp.h | 2 | ||||
| -rw-r--r-- | Eigen/src/Geometry/Homogeneous.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 322daad8f..c30d1bed9 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -429,7 +429,7 @@ template<typename Derived> class DenseBase template<typename BinaryOp> EIGEN_DEVICE_FUNC - typename internal::result_of<BinaryOp(typename internal::traits<Derived>::Scalar)>::type + typename internal::result_of<BinaryOp(typename internal::traits<Derived>::Scalar,typename internal::traits<Derived>::Scalar)>::type redux(const BinaryOp& func) const; template<typename Visitor> diff --git a/Eigen/src/Core/Redux.h b/Eigen/src/Core/Redux.h index 1a0a00481..f704fd07b 100644 --- a/Eigen/src/Core/Redux.h +++ b/Eigen/src/Core/Redux.h @@ -406,7 +406,7 @@ protected: */ template<typename Derived> template<typename Func> -EIGEN_STRONG_INLINE typename internal::result_of<Func(typename internal::traits<Derived>::Scalar)>::type +EIGEN_STRONG_INLINE typename internal::result_of<Func(typename internal::traits<Derived>::Scalar,typename internal::traits<Derived>::Scalar)>::type DenseBase<Derived>::redux(const Func& func) const { eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix"); diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h index b3dc0c224..a15777a5e 100644 --- a/Eigen/src/Core/VectorwiseOp.h +++ b/Eigen/src/Core/VectorwiseOp.h @@ -124,7 +124,7 @@ EIGEN_MEMBER_FUNCTOR(prod, (Size-1)*NumTraits<Scalar>::MulCost); template <typename BinaryOp, typename Scalar> struct member_redux { typedef typename result_of< - BinaryOp(Scalar) + BinaryOp(Scalar,Scalar) >::type result_type; template<typename _Scalar, int Size> struct Cost { enum { value = (Size-1) * functor_traits<BinaryOp>::Cost }; }; diff --git a/Eigen/src/Geometry/Homogeneous.h b/Eigen/src/Geometry/Homogeneous.h index f16451656..756ecf9dc 100644 --- a/Eigen/src/Geometry/Homogeneous.h +++ b/Eigen/src/Geometry/Homogeneous.h @@ -102,7 +102,7 @@ template<typename MatrixType,int _Direction> class Homogeneous } template<typename Func> - EIGEN_STRONG_INLINE typename internal::result_of<Func(Scalar)>::type + EIGEN_STRONG_INLINE typename internal::result_of<Func(Scalar,Scalar)>::type redux(const Func& func) const { return func(m_matrix.redux(func), Scalar(1)); |