From ed369d63745129e452cdfc9323037e8ce00c73f8 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 5 Sep 2012 19:02:29 +0000 Subject: [PATCH] Unordered: Move MSVC warning suppression to correct location. [SVN r80412] --- include/boost/unordered/detail/buckets.hpp | 9 --------- include/boost/unordered/detail/table.hpp | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/boost/unordered/detail/buckets.hpp b/include/boost/unordered/detail/buckets.hpp index 14314398..4bfae1c9 100644 --- a/include/boost/unordered/detail/buckets.hpp +++ b/include/boost/unordered/detail/buckets.hpp @@ -20,11 +20,6 @@ #include #include -#if defined(BOOST_MSVC) -#pragma warning(push) -#pragma warning(disable:4127) // conditional expression is constant -#endif - namespace boost { namespace unordered { namespace detail { template struct table; @@ -799,8 +794,4 @@ namespace boost { namespace unordered { namespace detail { #endif }}} -#if defined(BOOST_MSVC) -#pragma warning(pop) -#endif - #endif diff --git a/include/boost/unordered/detail/table.hpp b/include/boost/unordered/detail/table.hpp index 83a35f3c..4198a8f7 100644 --- a/include/boost/unordered/detail/table.hpp +++ b/include/boost/unordered/detail/table.hpp @@ -13,6 +13,11 @@ #include #include +#if defined(BOOST_MSVC) +#pragma warning(push) +#pragma warning(disable:4127) // conditional expression is constant +#endif + namespace boost { namespace unordered { namespace detail { //////////////////////////////////////////////////////////////////////////// @@ -895,4 +900,8 @@ namespace boost { namespace unordered { namespace detail { } }}} +#if defined(BOOST_MSVC) +#pragma warning(pop) +#endif + #endif