From 815fa0dbf63f112f98fe3ac38483e0248caf9eec Mon Sep 17 00:00:00 2001
From: Jonas Adler <jonasadl@kth.se>
Date: Wed, 22 Jul 2015 12:29:18 +0200
Subject: Fixed some compiler bugs in NVCC, now compiles with CUDA. (chtz:
 Manually joined sevaral commits to keep the history clean)

---
 Eigen/Core | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Eigen/Core')

diff --git a/Eigen/Core b/Eigen/Core
index de94b5b75..91713a43e 100644
--- a/Eigen/Core
+++ b/Eigen/Core
@@ -24,9 +24,15 @@
   #ifdef EIGEN_INTERNAL_DEBUGGING
   #undef EIGEN_INTERNAL_DEBUGGING
   #endif
-  
+
   // Do not try to vectorize on CUDA!
+  #ifndef EIGEN_DONT_VECTORIZE
   #define EIGEN_DONT_VECTORIZE
+  #endif
+
+  #ifdef EIGEN_EXCEPTIONS
+  #undef EIGEN_EXCEPTIONS
+  #endif
   
   // All functions callable from CUDA code must be qualified with __device__
   #define EIGEN_DEVICE_FUNC __host__ __device__
-- 
cgit v1.2.3