From fabae6c9a180669f6afbd732ee6973311a36476c Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Fri, 10 Jun 2016 15:58:33 +0200 Subject: [PATCH] Cleanup --- Eigen/src/plugins/ArrayCwiseBinaryOps.h | 12 ++---------- Eigen/src/plugins/CommonCwiseBinaryOps.h | 14 -------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/Eigen/src/plugins/ArrayCwiseBinaryOps.h b/Eigen/src/plugins/ArrayCwiseBinaryOps.h index da47a7ed7..7f7d0dbf4 100644 --- a/Eigen/src/plugins/ArrayCwiseBinaryOps.h +++ b/Eigen/src/plugins/ArrayCwiseBinaryOps.h @@ -81,16 +81,8 @@ max * Example: \include Cwise_array_power_array.cpp * Output: \verbinclude Cwise_array_power_array.out */ -template -EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE -const CwiseBinaryOp, const Derived, const ExponentDerived> -pow(const ArrayBase& exponents) const -{ - return CwiseBinaryOp, const Derived, const ExponentDerived>( - this->derived(), - exponents.derived() - ); -} +EIGEN_MAKE_CWISE_BINARY_OP(pow,binary_pow) + // TODO code generating macros could be moved to Macros.h and could include generation of documentation #define EIGEN_MAKE_CWISE_COMP_OP(OP, COMPARATOR) \ diff --git a/Eigen/src/plugins/CommonCwiseBinaryOps.h b/Eigen/src/plugins/CommonCwiseBinaryOps.h index 6a5ccc1aa..f16be7bea 100644 --- a/Eigen/src/plugins/CommonCwiseBinaryOps.h +++ b/Eigen/src/plugins/CommonCwiseBinaryOps.h @@ -17,13 +17,6 @@ * \sa class CwiseBinaryOp, operator-=() */ EIGEN_MAKE_CWISE_BINARY_OP(operator-,difference) -// template -// EIGEN_DEVICE_FUNC -// EIGEN_STRONG_INLINE const EIGEN_CWISE_BINARY_RETURN_TYPE(Derived,OtherDerived,difference) -// operator-(const EIGEN_CURRENT_STORAGE_BASE_CLASS &other) const -// { -// return EIGEN_CWISE_BINARY_RETURN_TYPE(Derived,OtherDerived,difference)(derived(), other.derived()); -// } /** \returns an expression of the sum of \c *this and \a other * @@ -32,13 +25,6 @@ EIGEN_MAKE_CWISE_BINARY_OP(operator-,difference) * \sa class CwiseBinaryOp, operator+=() */ EIGEN_MAKE_CWISE_BINARY_OP(operator+,sum) -// template -// EIGEN_DEVICE_FUNC -// EIGEN_STRONG_INLINE const EIGEN_CWISE_BINARY_RETURN_TYPE(Derived,OtherDerived,sum) -// operator+(const EIGEN_CURRENT_STORAGE_BASE_CLASS &other) const -// { -// return EIGEN_CWISE_BINARY_RETURN_TYPE(Derived,OtherDerived,sum)(derived(), other.derived()); -// } /** \returns an expression of a custom coefficient-wise operator \a func of *this and \a other *