Swiftdiff options
Diffstat (limited to '3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp b/3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp index 8fcc69e..aac9851 100644 --- a/3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp +++ b/3rdParty/Boost/src/boost/type_traits/is_polymorphic.hpp @@ -17,6 +17,11 @@ #include <boost/type_traits/detail/bool_trait_def.hpp> #include <boost/detail/workaround.hpp> +#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1700) +#pragma warning(push) +#pragma warning(disable:4250) +#endif + namespace boost{ #ifndef BOOST_IS_POLYMORPHIC @@ -111,4 +116,8 @@ BOOST_TT_AUX_BOOL_TRAIT_DEF1(is_polymorphic,T,BOOST_IS_POLYMORPHIC(T)) #include <boost/type_traits/detail/bool_trait_undef.hpp> +#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1700) +#pragma warning(pop) +#endif + #endif |