[Boost-commit] svn:boost r41798 - trunk/boost/function

From: dgregor_at_[hidden]
Date: 2007-12-06 13:39:07

Author: dgregor
Date: 2007-12-06 13:39:06 EST (Thu, 06 Dec 2007)
New Revision: 41798
URL: http://svn.boost.org/trac/boost/changeset/41798

Log:
Disable more Visual C++ warnings in Function headers. Fixes #1416

Text files modified: 
   trunk/boost/function/function_base.hpp     |     1 +                                       
   trunk/boost/function/function_template.hpp |     9 +++++++++                               
   2 files changed, 10 insertions(+), 0 deletions(-)

Modified: trunk/boost/function/function_base.hpp
==============================================================================
--- trunk/boost/function/function_base.hpp	(original)
+++ trunk/boost/function/function_base.hpp	2007-12-06 13:39:06 EST (Thu, 06 Dec 2007)
@@ -33,6 +33,7 @@
 #if defined(BOOST_MSVC)
 #   pragma warning( push )
 #   pragma warning( disable : 4793 ) // complaint about native code generation
+#   pragma warning( disable : 4127 ) // "conditional expression is constant"
 #endif       
 
 // Define BOOST_FUNCTION_STD_NS to the namespace that contains type_info.

Modified: trunk/boost/function/function_template.hpp
==============================================================================
--- trunk/boost/function/function_template.hpp	(original)
+++ trunk/boost/function/function_template.hpp	2007-12-06 13:39:06 EST (Thu, 06 Dec 2007)
@@ -11,6 +11,11 @@
 // protection.
 #include <boost/function/detail/prologue.hpp>
 
+#if defined(BOOST_MSVC)
+#   pragma warning( push )
+#   pragma warning( disable : 4127 ) // "conditional expression is constant"
+#endif       
+
 #define BOOST_FUNCTION_TEMPLATE_PARMS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, typename T)
 
 #define BOOST_FUNCTION_TEMPLATE_ARGS BOOST_PP_ENUM_PARAMS(BOOST_FUNCTION_NUM_ARGS, T)
@@ -958,3 +963,7 @@
 #undef BOOST_FUNCTION_ARG_TYPES
 #undef BOOST_FUNCTION_VOID_RETURN_TYPE
 #undef BOOST_FUNCTION_RETURN
+
+#if defined(BOOST_MSVC)
+#   pragma warning( pop )
+#endif