diff options
| author |  Robert Lukierski <robert@lukierski.eu> | 2016-10-12 18:59:05 +0100 |
|---|---|---|
| committer | Robert Lukierski <robert@lukierski.eu> | 2016-10-12 18:59:05 +0100 |
| commit | 471075f7ad8e78d4d3e400bc1124e39102515aec (patch) | |
| tree | 2c040cbd298ffd8be0598a73be613fe3e0848509 /Eigen/src/Core/PlainObjectBase.h | |
| parent | 86711497c4584534793b186fb0c72f8002a9fe86 (diff) | |
Fixes min() warnings.
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 00313920c..a4ade63b8 100644 --- a/Eigen/src/Core/PlainObjectBase.h +++ b/Eigen/src/Core/PlainObjectBase.h @@ -917,8 +917,8 @@ struct conservative_resize_like_impl // The storage order does not allow us to use reallocation. typename Derived::PlainObject tmp(rows,cols); EIGEN_USING_STD_MATH(min) - const Index common_rows = min(rows, _this.rows()); - const Index common_cols = min(cols, _this.cols()); + const Index common_rows = (min)(rows, _this.rows()); + const Index common_cols = (min)(cols, _this.cols()); tmp.block(0,0,common_rows,common_cols) = _this.block(0,0,common_rows,common_cols); _this.derived().swap(tmp); } @@ -952,8 +952,8 @@ struct conservative_resize_like_impl // The storage order does not allow us to use reallocation. typename Derived::PlainObject tmp(other); EIGEN_USING_STD_MATH(min) - const Index common_rows = min(tmp.rows(), _this.rows()); - const Index common_cols = min(tmp.cols(), _this.cols()); + const Index common_rows = (min)(tmp.rows(), _this.rows()); + const Index common_cols = (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); } |