Commit 57001975 authored by Ben Boeckel's avatar Ben Boeckel

Merge branch 'for-vtkm' into 'for/vtk-m'

Tao now uses _Pragma over #pragma

See merge request !3
parents 8e70fa8a 4f4016cd
......@@ -37,9 +37,9 @@
#ifndef TAO_TUPLE_SUPPRESS_NVCC_HD_WARN
#ifdef __CUDACC__
#if __CUDAVER__ >= 75000
#define TAO_TUPLE_SUPPRESS_NVCC_HD_WARN #pragma nv_exec_check_disable
#define TAO_TUPLE_SUPPRESS_NVCC_HD_WARN _Pragma("nv_exec_check_disable")
#else
#define TAO_TUPLE_SUPPRESS_NVCC_HD_WARN #pragma hd_warning_disable
#define TAO_TUPLE_SUPPRESS_NVCC_HD_WARN _Pragma("hd_warning_disable")
#endif
#else
#define TAO_TUPLE_SUPPRESS_NVCC_HD_WARN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment