From 22bff949c898e7c340a415d771145c0bd22317d6 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 21 Jul 2011 11:19:36 +0200 Subject: protect calls to min and max with parentheses to make Eigen compatible with default windows.h (transplanted from 49b6e9143e1d74441924c0c313536e263e12a55c ) --- test/bandmatrix.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/bandmatrix.cpp') 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 void bandmatrix(const MatrixType& _m) m.col(i).setConstant(static_cast(i+1)); dm1.col(i).setConstant(static_cast(i+1)); } - Index d = std::min(rows,cols); + Index d = (std::min)(rows,cols); Index a = std::max(0,cols-d-supers); Index b = std::max(0,rows-d-subs); if(a>0) dm1.block(0,d+supers,rows,a).setZero(); -- cgit v1.2.3