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/Core/Diagonal.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/Core/Diagonal.h')
| -rw-r--r-- | Eigen/src/Core/Diagonal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Eigen/src/Core/Diagonal.h b/Eigen/src/Core/Diagonal.h index 3c9f517d1..3a833f678 100644 --- a/Eigen/src/Core/Diagonal.h +++ b/Eigen/src/Core/Diagonal.h @@ -87,7 +87,7 @@ template<typename MatrixType, int DiagIndex> class Diagonal EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Diagonal) inline Index rows() const - { return m_index.value()<0 ? std::min(m_matrix.cols(),m_matrix.rows()+m_index.value()) : std::min(m_matrix.rows(),m_matrix.cols()-m_index.value()); } + { return m_index.value()<0 ? (std::min)(m_matrix.cols(),m_matrix.rows()+m_index.value()) : (std::min)(m_matrix.rows(),m_matrix.cols()-m_index.value()); } inline Index cols() const { return 1; } |