Merge topic 'suppress_thrust_warnings_on_windows'

8c579b77 Setup VTKM_THIRDPARTY_PRE_INCLUDE/POST_INCLUDE for MSVC.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !352
This commit is contained in:
Robert Maynard 2016-03-10 16:09:30 -05:00 committed by Kitware Robot
commit 5df0cf42fe

@ -157,6 +157,15 @@
#define VTKM_THIRDPARTY_POST_INCLUDE \
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
#else
#define VTKM_THIRDPARTY_PRE_INCLUDE
#define VTKM_THIRDPARTY_POST_INCLUDE