diff --git a/include/boost/unordered/detail/foa.hpp b/include/boost/unordered/detail/foa.hpp index d9faf56b..a0ea22e8 100644 --- a/include/boost/unordered/detail/foa.hpp +++ b/include/boost/unordered/detail/foa.hpp @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -825,6 +826,14 @@ constexpr static float const mlf = 0.875f; #pragma warning(disable:4714) /* marked as __forceinline not inlined */ #endif +#if BOOST_WORKAROUND(BOOST_MSVC,<=1900) +/* VS2015 marks as unreachable generic catch clauses around non-throwing + * code. + */ +#pragma warning(push) +#pragma warning(disable:4702) +#endif + template class @@ -1525,6 +1534,11 @@ private: std::size_t ml; }; + +#if BOOST_WORKAROUND(BOOST_MSVC,<=1900) +#pragma warning(pop) /* C4702 */ +#endif + #if defined(BOOST_MSVC) #pragma warning(pop) /* C4714 */ #endif