From e37eedadb117795d724fb4de7653b767d30deea1 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 31 Mar 2020 14:56:49 -0400 Subject: [PATCH] CUDA doesn't like [[deprecated]] when applied to typedefs So we disable deprecation support when building with `nvcc` --- vtkm/Deprecated.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vtkm/Deprecated.h b/vtkm/Deprecated.h index 79aa774c6..9ee4d69c2 100644 --- a/vtkm/Deprecated.h +++ b/vtkm/Deprecated.h @@ -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