From 86711497c4584534793b186fb0c72f8002a9fe86 Mon Sep 17 00:00:00 2001
From: Robert Lukierski <robert@lukierski.eu>
Date: Wed, 12 Oct 2016 16:35:17 +0100
Subject: Adding EIGEN_DEVICE_FUNC in the Geometry module. Additional CUDA
 necessary fixes in the Core (mostly usage of EIGEN_USING_STD_MATH).

---
 Eigen/src/Core/AssignEvaluator.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/Eigen/src/Core/AssignEvaluator.h b/Eigen/src/Core/AssignEvaluator.h
index b7cc7c0e9..30b36be11 100644
--- a/Eigen/src/Core/AssignEvaluator.h
+++ b/Eigen/src/Core/AssignEvaluator.h
@@ -517,6 +517,7 @@ struct dense_assignment_loop<Kernel, SliceVectorizedTraversal, NoUnrolling>
 {
   EIGEN_DEVICE_FUNC static inline void run(Kernel &kernel)
   {
+    EIGEN_USING_STD_MATH(min)
     typedef typename Kernel::Scalar Scalar;
     typedef typename Kernel::PacketType PacketType;
     enum {
@@ -554,7 +555,7 @@ struct dense_assignment_loop<Kernel, SliceVectorizedTraversal, NoUnrolling>
       for(Index inner = alignedEnd; inner<innerSize ; ++inner)
         kernel.assignCoeffByOuterInner(outer, inner);
 
-      alignedStart = std::min<Index>((alignedStart+alignedStep)%packetSize, innerSize);
+      alignedStart = min((Index)(alignedStart+alignedStep)%packetSize, (Index)innerSize);
     }
   }
 };
-- 
cgit v1.2.3