diff options
author | 2011-07-21 11:19:36 +0200 | |
---|---|---|
committer | 2011-07-21 11:19:36 +0200 | |
commit | 22bff949c898e7c340a415d771145c0bd22317d6 (patch) | |
tree | be0fc956a220db15d4d7622fc580777f563ea643 /Eigen/src/Core/products/GeneralMatrixVector.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 'Eigen/src/Core/products/GeneralMatrixVector.h')
-rw-r--r-- | Eigen/src/Core/products/GeneralMatrixVector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Eigen/src/Core/products/GeneralMatrixVector.h b/Eigen/src/Core/products/GeneralMatrixVector.h index 540638b5a..e0e2cbf8f 100644 --- a/Eigen/src/Core/products/GeneralMatrixVector.h +++ b/Eigen/src/Core/products/GeneralMatrixVector.h @@ -134,7 +134,7 @@ EIGEN_DONT_INLINE static void run( } else { - skipColumns = std::min(skipColumns,cols); + skipColumns = (std::min)(skipColumns,cols); // note that the skiped columns are processed later. } @@ -386,7 +386,7 @@ EIGEN_DONT_INLINE static void run( } else { - skipRows = std::min(skipRows,Index(rows)); + skipRows = (std::min)(skipRows,Index(rows)); // note that the skiped columns are processed later. } eigen_internal_assert( alignmentPattern==NoneAligned |