mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-18 18:15:44 +00:00
Merge topic 'suppress_thrust_warnings_on_windows'
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:
commit
ba202cc1c8
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user