From 4f1a7e51c17586487c986a456e39af40b41bf4b4 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 30 Mar 2016 17:59:49 -0700 Subject: Pull math functions from the global namespace only when compiling cuda code with nvcc. When compiling with clang, we want to use the std namespace. --- Eigen/Core | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Eigen') diff --git a/Eigen/Core b/Eigen/Core index 8428c51e4..24799f32b 100644 --- a/Eigen/Core +++ b/Eigen/Core @@ -42,7 +42,10 @@ #endif -#if defined(__CUDA_ARCH__) +// When compiling CUDA device code with NVCC, pull in math functions from the +// global namespace. In host mode, and when device doee with clang, use the +// std versions. +#if defined(__CUDA_ARCH__) && defined(__NVCC__) #define EIGEN_USING_STD_MATH(FUNC) using ::FUNC; #else #define EIGEN_USING_STD_MATH(FUNC) using std::FUNC; -- cgit v1.2.3