From adcb220db3db05712fc6c07701b9ef3bc65103bc Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Aug 2011 15:22:48 +0200 Subject: [PATCH] fix linking issue with msvc --- Eigen/src/Eigen2Support/Cwise.h | 8 ++++++-- Eigen/src/Eigen2Support/CwiseOperators.h | 18 ------------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/Eigen/src/Eigen2Support/Cwise.h b/Eigen/src/Eigen2Support/Cwise.h index 2d40c2d0f..2dc83b6a7 100644 --- a/Eigen/src/Eigen2Support/Cwise.h +++ b/Eigen/src/Eigen2Support/Cwise.h @@ -82,13 +82,17 @@ template class Cwise const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_quotient_op) operator/(const MatrixBase &other) const; + /** \deprecated ArrayBase::min() */ template const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op) - (min)(const MatrixBase &other) const; + (min)(const MatrixBase &other) const + { return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op)(_expression(), other.derived()); } + /** \deprecated ArrayBase::max() */ template const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op) - (max)(const MatrixBase &other) const; + (max)(const MatrixBase &other) const + { return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op)(_expression(), other.derived()); } const EIGEN_CWISE_UNOP_RETURN_TYPE(internal::scalar_abs_op) abs() const; const EIGEN_CWISE_UNOP_RETURN_TYPE(internal::scalar_abs2_op) abs2() const; diff --git a/Eigen/src/Eigen2Support/CwiseOperators.h b/Eigen/src/Eigen2Support/CwiseOperators.h index a18cab97e..9c28559c3 100644 --- a/Eigen/src/Eigen2Support/CwiseOperators.h +++ b/Eigen/src/Eigen2Support/CwiseOperators.h @@ -96,24 +96,6 @@ inline ExpressionType& Cwise::operator/=(const MatrixBase -template -EIGEN_STRONG_INLINE const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op) -(Cwise::min)(const MatrixBase &other) const -{ - return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op)(_expression(), other.derived()); -} - -/** \deprecated ArrayBase::max() */ -template -template -EIGEN_STRONG_INLINE const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op) -(Cwise::max)(const MatrixBase &other) const -{ - return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op)(_expression(), other.derived()); -} - /*************************************************************************** * The following functions were defined in Array ***************************************************************************/