From 55280637f804d051682764ba3686d3d24a6b2255 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Fri, 11 Mar 2016 09:55:39 -0500 Subject: [PATCH] Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC. We now properly suppress a collection of warnings from thirdparty headers on windows. --- vtkm/internal/Configure.h.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vtkm/internal/Configure.h.in b/vtkm/internal/Configure.h.in index 8f3208ada..58c73adf8 100644 --- a/vtkm/internal/Configure.h.in +++ b/vtkm/internal/Configure.h.in @@ -158,14 +158,11 @@ VTK_M_THRIDPARTY_WARNINGS_POP #elif (defined(VTKM_MSVC)) -#define VTK_M_THIRDPARTY_WARNINGS_PUSH \ - _Pragma("push") -#define VTK_M_THRIDPARTY_WARNINGS_POP \ - _Pragma("pop") -#define VTK_M_THIRDPARTY_MSVC_WARNING_PRAGMAS \ - _Pragma("warning ( disable : 4267 )") \ -#endif - +#define VTKM_THIRDPARTY_PRE_INCLUDE \ + __pragma(warning(push)) \ + __pragma(warning(disable:4267)) +#define VTKM_THIRDPARTY_POST_INCLUDE \ + __pragma(warning(pop)) #else #define VTKM_THIRDPARTY_PRE_INCLUDE #define VTKM_THIRDPARTY_POST_INCLUDE