Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-19 10:35:42 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'suppress_thrust_warnings_on_windows'

Browse Source 
55280637 Correct the VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !354
This commit is contained in:
Robert Maynard 2016-03-11 10:04:16 -05:00 committed by Kitware Robot
commit ba202cc1c8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vtkm/internal/Configure.h.in
View File

@ -158,14 +158,11 @@
VTK_M_THRIDPARTY_WARNINGS_POP VTK_M_THRIDPARTY_WARNINGS_POP
#elif (defined(VTKM_MSVC)) #elif (defined(VTKM_MSVC))
#define VTK_M_THIRDPARTY_WARNINGS_PUSH \ #define VTKM_THIRDPARTY_PRE_INCLUDE \
_Pragma("push") __pragma(warning(push)) \
#define VTK_M_THRIDPARTY_WARNINGS_POP \ __pragma(warning(disable:4267))
_Pragma("pop") #define VTKM_THIRDPARTY_POST_INCLUDE \
#define VTK_M_THIRDPARTY_MSVC_WARNING_PRAGMAS \ __pragma(warning(pop))
_Pragma("warning ( disable : 4267 )") \
#endif
#else #else
#define VTKM_THIRDPARTY_PRE_INCLUDE #define VTKM_THIRDPARTY_PRE_INCLUDE
#define VTKM_THIRDPARTY_POST_INCLUDE #define VTKM_THIRDPARTY_POST_INCLUDE