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 /Eigen/src/Core/PlainObjectBase.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/PlainObjectBase.h')
| -rw-r--r-- | Eigen/src/Core/PlainObjectBase.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/PlainObjectBase.h b/Eigen/src/Core/PlainObjectBase.h index 5358cb572..ed34b0ed9 100644 --- a/Eigen/src/Core/PlainObjectBase.h +++ b/Eigen/src/Core/PlainObjectBase.h @@ -647,8 +647,8 @@ struct internal::conservative_resize_like_impl { // The storage order does not allow us to use reallocation. typename Derived::PlainObject tmp(rows,cols); - const Index common_rows = std::min(rows, _this.rows()); - const Index common_cols = std::min(cols, _this.cols()); + const Index common_rows = (std::min)(rows, _this.rows()); + const Index common_cols = (std::min)(cols, _this.cols()); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); _this.derived().swap(tmp); } @@ -681,8 +681,8 @@ struct internal::conservative_resize_like_impl { // The storage order does not allow us to use reallocation. typename Derived::PlainObject tmp(other); - const Index common_rows = std::min(tmp.rows(), _this.rows()); - const Index common_cols = std::min(tmp.cols(), _this.cols()); + const Index common_rows = (std::min)(tmp.rows(), _this.rows()); + const Index common_cols = (std::min)(tmp.cols(), _this.cols()); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); _this.derived().swap(tmp); } |