aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/Core
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-07-22 18:12:16 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-07-22 18:12:16 -0700
commitce65c2922add3b4a1f54c5080ec3a85ac3e878af (patch)
tree07c5f20311c22732f6a5080d588ee36fab0d70e5 /Eigen/Core
parent4200bdec2478d07b77f25ccc87094e2fba63cec6 (diff)
parent3b0ad02c1065c69b03798144febd30eb808cb24b (diff)
Pulled latest updates from trunk
Diffstat (limited to 'Eigen/Core')
-rw-r--r--Eigen/Core8
1 files changed, 7 insertions, 1 deletions
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__