Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'disable_deprecation_under_nvcc'

Browse Source 
e37eedadb CUDA doesn't like [[deprecated]] when applied to typedefs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@sandia.gov>
Merge-request: !2018
This commit is contained in:
Robert Maynard 2020-04-01 12:30:13 +00:00 committed by Kitware Robot
commit ac55c0e551
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/Deprecated.h
View File

@ -64,8 +64,8 @@
// C++14 and better supports [[deprecated]]
// Except in these cases:
// - nvcc on visual studio
#if !(defined(VTKM_MSVC) && defined(VTKM_CUDA))
// - nvcc
#if !(defined(VTKM_CUDA))
#define VTK_M_DEPRECATED_ATTRIBUTE_SUPPORTED
#endif