From a94791b69a53504aba88f06caad596afa1ac6a34 Mon Sep 17 00:00:00 2001
From: Robert Lukierski <robert@lukierski.eu>
Date: Thu, 13 Oct 2016 15:00:22 +0100
Subject: Fixes for min and abs after Benoit's comments, switched to numext.

---
 Eigen/src/Core/CwiseNullaryOp.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Eigen/src/Core/CwiseNullaryOp.h')

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;
   }
-- 
cgit v1.2.3