diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-07-21 11:19:36 +0200 |
| commit | 22bff949c898e7c340a415d771145c0bd22317d6 (patch) | |
| tree | be0fc956a220db15d4d7622fc580777f563ea643 /Eigen/src/Eigen2Support/Cwise.h | |
| parent | d4bd8bddb5e9f968ffcbdfff5936934e3d706684 (diff) | |
protect calls to min and max with parentheses to make Eigen compatible with default windows.h
(transplanted from 49b6e9143e1d74441924c0c313536e263e12a55c
)
Diffstat (limited to 'Eigen/src/Eigen2Support/Cwise.h')
| -rw-r--r-- | Eigen/src/Eigen2Support/Cwise.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Eigen2Support/Cwise.h b/Eigen/src/Eigen2Support/Cwise.h index c619d389c..2d40c2d0f 100644 --- a/Eigen/src/Eigen2Support/Cwise.h +++ b/Eigen/src/Eigen2Support/Cwise.h @@ -84,11 +84,11 @@ template<typename ExpressionType> class Cwise 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; 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; const EIGEN_CWISE_UNOP_RETURN_TYPE(internal::scalar_abs_op) abs() const; const EIGEN_CWISE_UNOP_RETURN_TYPE(internal::scalar_abs2_op) abs2() const; |