Index: core/primitives/impl/numerics.ipp =================================================================== --- core/primitives/impl/numerics.ipp (revision 41836) +++ core/primitives/impl/numerics.ipp (working copy) @@ -149,6 +149,11 @@ // initialized before calling this function. // /////////////////////////////////////////////////////////////////////// +#if defined(BOOST_MSVC) +#pragma warning(push) +#pragma warning(disable:4127) //conditional expression is constant +#endif + template struct positive_accumulate { @@ -349,11 +354,6 @@ // real_parser_impl class // /////////////////////////////////////////////////////////////////////// -#if (defined(BOOST_MSVC) && (BOOST_MSVC <= 1310)) -#pragma warning(push) -#pragma warning(disable:4127) -#endif - template struct real_parser_impl { @@ -462,7 +462,7 @@ } }; -#if (defined(BOOST_MSVC) && (BOOST_MSVC <= 1310)) +#if defined(BOOST_MSVC) #pragma warning(pop) #endif