Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-16 17:22:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'update_tao_cuda_pragmas'

Browse Source 
967581cf1 Merge branch 'upstream-taotuple' into update_tao_cuda_pragmas
907846086 taotuple 2019-04-24 (57001975)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1659
This commit is contained in:
Robert Maynard 2019-04-29 17:11:45 +00:00 committed by Kitware Robot
commit c399a812ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/thirdparty/taotuple/vtkmtaotuple/include/tao/tuple/tuple.hpp vendored
View File

@ -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