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 /test/bandmatrix.cpp | |
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 'test/bandmatrix.cpp')
-rw-r--r-- | test/bandmatrix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/bandmatrix.cpp b/test/bandmatrix.cpp index 84fc387e0..996886f43 100644 --- a/test/bandmatrix.cpp +++ b/test/bandmatrix.cpp @@ -61,7 +61,7 @@ template<typename MatrixType> void bandmatrix(const MatrixType& _m) m.col(i).setConstant(static_cast<RealScalar>(i+1)); dm1.col(i).setConstant(static_cast<RealScalar>(i+1)); } - Index d = std::min(rows,cols); + Index d = (std::min)(rows,cols); Index a = std::max<Index>(0,cols-d-supers); Index b = std::max<Index>(0,rows-d-subs); if(a>0) dm1.block(0,d+supers,rows,a).setZero(); |