Config: Correct rebase error.
[git-p4: depot-paths = "//sw/gpgpu/thrust/": change = 24246167]
MODIFY
thrust/detail/config/exec_check_disable.h
thrust/detail/config/exec_check_disable.h
#include <thrust/detail/config.h>
-#if defined(__CUDACC__) && !defined(__clang__)
+#if defined(__CUDACC__) && !(defined(__CUDA__) && defined(__clang__))
+
+#define __thrust_exec_check_disable__ #pragma nv_exec_check_disable
#else

Config: Correct rebase error.

[git-p4: depot-paths = "//sw/gpgpu/thrust/": change = 24246167]