devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes min() warnings.

Browse Source
This commit is contained in:
Robert Lukierski
2016-10-12 18:59:05 +01:00
parent 86711497c4
commit 471075f7ad
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Core/PlainObjectBase.h
View File

@@ -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);
}