[Boost-commit] svn:boost r57976 - in trunk: boost/functional/hash libs/functional/hash/test

Subject: [Boost-commit] svn:boost r57976 - in trunk: boost/functional/hash libs/functional/hash/test
From: daniel_james_at_[hidden]
Date: 2009-11-27 14:43:27

Author: danieljames
Date: 2009-11-27 14:43:26 EST (Fri, 27 Nov 2009)
New Revision: 57976
URL: http://svn.boost.org/trac/boost/changeset/57976

Log:
Try to suppress some more Visual C++ warnings.
Text files modified: 
   trunk/boost/functional/hash/hash.hpp                  |     2 +-                                      
   trunk/libs/functional/hash/test/hash_complex_test.cpp |     3 +++                                     
   trunk/libs/functional/hash/test/hash_float_test.hpp   |     4 ++++                                    
   3 files changed, 8 insertions(+), 1 deletions(-)

Modified: trunk/boost/functional/hash/hash.hpp
==============================================================================
--- trunk/boost/functional/hash/hash.hpp	(original)
+++ trunk/boost/functional/hash/hash.hpp	2009-11-27 14:43:26 EST (Fri, 27 Nov 2009)
@@ -199,7 +199,7 @@
 
 #if defined(BOOST_MSVC)
 #pragma warning(push)
-#if BOOST_MSVC == 1400
+#if BOOST_MSVC <= 1400
 #pragma warning(disable:4267) // 'argument' : conversion from 'size_t' to 'unsigned int',
                               // possible loss of data
                               // A misguided attempt to detect 64-bit incompatability.

Modified: trunk/libs/functional/hash/test/hash_complex_test.cpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_complex_test.cpp	(original)
+++ trunk/libs/functional/hash/test/hash_complex_test.cpp	2009-11-27 14:43:26 EST (Fri, 27 Nov 2009)
@@ -25,6 +25,9 @@
 #pragma warning(disable:4305) // truncation from 'double' to 'const std::complex<float>::_Ty'
 #pragma warning(disable:4309) // truncation of constant value
 #pragma warning(disable:4512) // assignment operator could not be generated
+#if BOOST_MSVC < 1400
+#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#endif
 #endif
 
 #include <complex>

Modified: trunk/libs/functional/hash/test/hash_float_test.hpp
==============================================================================
--- trunk/libs/functional/hash/test/hash_float_test.hpp	(original)
+++ trunk/libs/functional/hash/test/hash_float_test.hpp	2009-11-27 14:43:26 EST (Fri, 27 Nov 2009)
@@ -23,6 +23,10 @@
 #if defined(BOOST_MSVC)
 #pragma warning(push)
 #pragma warning(disable:4127) // conditional expression is constant
+#pragma warning(disable:4723) // conditional expression is constant
+#if BOOST_MSVC < 1400
+#pragma warning(disable:4267) // conversion from 'size_t' to 'unsigned int', possible loss of data
+#endif
 #endif
 
 char const* float_type(float*) { return "float"; }