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 /unsupported/Eigen/src/IterativeSolvers/IterationController.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 'unsupported/Eigen/src/IterativeSolvers/IterationController.h')
| -rw-r--r-- | unsupported/Eigen/src/IterativeSolvers/IterationController.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/unsupported/Eigen/src/IterativeSolvers/IterationController.h index 385d8c546..a65793cd5 100644 --- a/unsupported/Eigen/src/IterativeSolvers/IterationController.h +++ b/unsupported/Eigen/src/IterativeSolvers/IterationController.h @@ -141,7 +141,7 @@ class IterationController bool converged(double nr) { m_res = internal::abs(nr); - m_resminreach = std::min(m_resminreach, m_res); + m_resminreach = (std::min)(m_resminreach, m_res); return converged(); } template<typename VectorType> bool converged(const VectorType &v) |