diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-12-03 17:45:07 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-12-03 17:45:07 +0100 |
| commit | 9ae606866cd62892499b31ec6720ef3861afdcfc (patch) | |
| tree | dba1c9872cc41de4bb2aae9844837634cb39b240 /Eigen | |
| parent | 950eeab4d764c15605c13fd0277084019f863b6f (diff) | |
Eigen2sSupport: import some fixes from the 3.0 branch (MSVC fix)
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Eigen2Support/Cwise.h | 8 | ||||
| -rw-r--r-- | 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<typename ExpressionType> class Cwise const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_quotient_op) operator/(const MatrixBase<OtherDerived> &other) const; + /** \deprecated ArrayBase::min() */ template<typename OtherDerived> const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op) - (min)(const MatrixBase<OtherDerived> &other) const; + (min)(const MatrixBase<OtherDerived> &other) const + { return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op)(_expression(), other.derived()); } + /** \deprecated ArrayBase::max() */ template<typename OtherDerived> const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op) - (max)(const MatrixBase<OtherDerived> &other) const; + (max)(const MatrixBase<OtherDerived> &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<ExpressionType>::operator/=(const MatrixBase<OtherD return m_matrix.const_cast_derived() = *this / other; } -/** \deprecated ArrayBase::min() */ -template<typename ExpressionType> -template<typename OtherDerived> -EIGEN_STRONG_INLINE const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op) -(Cwise<ExpressionType>::min)(const MatrixBase<OtherDerived> &other) const -{ - return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_min_op)(_expression(), other.derived()); -} - -/** \deprecated ArrayBase::max() */ -template<typename ExpressionType> -template<typename OtherDerived> -EIGEN_STRONG_INLINE const EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op) -(Cwise<ExpressionType>::max)(const MatrixBase<OtherDerived> &other) const -{ - return EIGEN_CWISE_BINOP_RETURN_TYPE(internal::scalar_max_op)(_expression(), other.derived()); -} - /*************************************************************************** * The following functions were defined in Array ***************************************************************************/ |