diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-15 22:40:18 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-15 22:40:18 +0200 |
| commit | 7baa1ba03eed515f6b202490a3200c90db8ba18d (patch) | |
| tree | f4a6ed5e3f99173ab3795faa772b1e9a67b8c22c /Eigen | |
| parent | 97cbe288295bd6a3bcde7030c26f19bf34e8b8b0 (diff) | |
Remove the usage of result_of for DenseBase::redux as discussed in bug #1006
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/DenseBase.h | 3 | ||||
| -rw-r--r-- | Eigen/src/Core/Redux.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Eigen/src/Core/DenseBase.h b/Eigen/src/Core/DenseBase.h index 361462e54..4e03e4a56 100644 --- a/Eigen/src/Core/DenseBase.h +++ b/Eigen/src/Core/DenseBase.h @@ -435,8 +435,7 @@ template<typename Derived> class DenseBase template<typename BinaryOp> EIGEN_DEVICE_FUNC - typename internal::result_of<BinaryOp(typename internal::traits<Derived>::Scalar,typename internal::traits<Derived>::Scalar)>::type - redux(const BinaryOp& func) const; + Scalar redux(const BinaryOp& func) const; template<typename Visitor> EIGEN_DEVICE_FUNC diff --git a/Eigen/src/Core/Redux.h b/Eigen/src/Core/Redux.h index f704fd07b..fea4e2895 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,typename internal::traits<Derived>::Scalar)>::type +typename internal::traits<Derived>::Scalar DenseBase<Derived>::redux(const Func& func) const { eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix"); |