Merge from trunk, finally.

[SVN r41817]
2007-12-07 01:12:02 +00:00
parent c484706c3f
commit fef2fd6670
2 changed files with 10 additions and 0 deletions
--- a/include/boost/function/function_base.hpp
+++ b/include/boost/function/function_base.hpp
@@ -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.