protect calls to min and max with parentheses to make Eigen compatible with default windows.h

(transplanted from 49b6e9143e
)
This commit is contained in:
Gael Guennebaud
2011-07-21 11:19:36 +02:00
parent d4bd8bddb5
commit 22bff949c8
67 changed files with 238 additions and 234 deletions

View File

@@ -97,7 +97,7 @@ class AmbiVector
void reallocateSparse()
{
Index copyElements = m_allocatedElements;
m_allocatedElements = std::min(Index(m_allocatedElements*1.5),m_size);
m_allocatedElements = (std::min)(Index(m_allocatedElements*1.5),m_size);
Index allocSize = m_allocatedElements * sizeof(ListEl);
allocSize = allocSize/sizeof(Scalar) + (allocSize%sizeof(Scalar)>0?1:0);
Scalar* newBuffer = new Scalar[allocSize];