diff options
| author |  Robert Lukierski <robert@lukierski.eu> | 2016-10-13 15:00:22 +0100 |
|---|---|---|
| committer | Robert Lukierski <robert@lukierski.eu> | 2016-10-13 15:00:22 +0100 |
| commit | a94791b69a53504aba88f06caad596afa1ac6a34 (patch) | |
| tree | aad3c9de62cdc9f4bdad4ca1d006c2be3bf8fd61 /Eigen/src/Core/CwiseNullaryOp.h | |
| parent | 471075f7ad8e78d4d3e400bc1124e39102515aec (diff) | |
Fixes for min and abs after Benoit's comments, switched to numext.
Diffstat (limited to 'Eigen/src/Core/CwiseNullaryOp.h')
| -rw-r--r-- | Eigen/src/Core/CwiseNullaryOp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index c47993e88..1caf37bb7 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -752,8 +752,7 @@ struct setIdentity_impl<Derived, true> static EIGEN_STRONG_INLINE Derived& run(Derived& m) { m.setZero(); - EIGEN_USING_STD_MATH(min) - const Index size = (min)(m.rows(), m.cols()); + const Index size = numext::mini(m.rows(), m.cols()); for(Index i = 0; i < size; ++i) m.coeffRef(i,i) = typename Derived::Scalar(1); return m; } |