mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-09-19 18:45:43 +00:00
Merge topic 'windows_long_symbol_warning_suppression'
6154e19a Explicitly disable warning C4503 when building with MSVC. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !401
This commit is contained in:
commit
d22c7794f8
@ -250,7 +250,6 @@ VTKM_THIRDPARTY_PRE_INCLUDE
|
|||||||
# include <boost/config.hpp>
|
# include <boost/config.hpp>
|
||||||
VTKM_THIRDPARTY_POST_INCLUDE
|
VTKM_THIRDPARTY_POST_INCLUDE
|
||||||
|
|
||||||
|
|
||||||
# if defined(BOOST_HAS_VARIADIC_TMPL)
|
# if defined(BOOST_HAS_VARIADIC_TMPL)
|
||||||
# define VTKM_USE_VARIADIC_TEMPLATE 1
|
# define VTKM_USE_VARIADIC_TEMPLATE 1
|
||||||
# endif
|
# endif
|
||||||
@ -260,4 +259,11 @@ VTKM_THIRDPARTY_POST_INCLUDE
|
|||||||
# error Both VTKM_USE_VARIADIC_TEMPLATE and VTKM_NO_VARIADIC_TEMPLATE defined. Do not know what to do.
|
# error Both VTKM_USE_VARIADIC_TEMPLATE and VTKM_NO_VARIADIC_TEMPLATE defined. Do not know what to do.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//With MSVC the types that we generate cause warning C4503 (long symbol names)
|
||||||
|
//this doesn't affect the resulting binary so we just supress that warning
|
||||||
|
//
|
||||||
|
#ifdef VTKM_MSVC
|
||||||
|
#pragma warning(disable:4503)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif //vtkm_internal_Configure_h
|
#endif //vtkm_internal_Configure_h
|
||||||
|
Loading…
Reference in New Issue
Block a user