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/NumericalDiff | |
| 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/NumericalDiff')
| -rw-r--r-- | unsupported/Eigen/src/NumericalDiff/NumericalDiff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h b/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h index dbf27c481..52dc0ec01 100644 --- a/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h +++ b/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h @@ -80,7 +80,7 @@ public: Scalar h; int nfev=0; const typename InputType::Index n = _x.size(); - const Scalar eps = internal::sqrt((std::max(epsfcn,NumTraits<Scalar>::epsilon() ))); + const Scalar eps = internal::sqrt(((std::max)(epsfcn,NumTraits<Scalar>::epsilon() ))); ValueType val1, val2; InputType x = _x; // TODO : we should do this only if the size is not already known |