[Boost-commit] svn:boost r58921 - in branches/release: boost libs/array/doc

Subject: [Boost-commit] svn:boost r58921 - in branches/release: boost libs/array/doc
From: marshall_at_[hidden]
Date: 2010-01-12 00:55:54

Author: marshall
Date: 2010-01-12 00:55:52 EST (Tue, 12 Jan 2010)
New Revision: 58921
URL: http://svn.boost.org/trac/boost/changeset/58921

Log:
Merged array changes from trunk to release
Properties modified: 
   branches/release/boost/array.hpp   (contents, props changed)
   branches/release/libs/array/doc/array.xml   (props changed)
Text files modified: 
   branches/release/boost/array.hpp |    12 ++++++++++++                            
   1 files changed, 12 insertions(+), 0 deletions(-)

Modified: branches/release/boost/array.hpp
==============================================================================
--- branches/release/boost/array.hpp	(original)
+++ branches/release/boost/array.hpp	2010-01-12 00:55:52 EST (Tue, 12 Jan 2010)
@@ -24,6 +24,13 @@
 #ifndef BOOST_ARRAY_HPP
 #define BOOST_ARRAY_HPP
 
+#include <boost/detail/workaround.hpp>
+
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
+# pragma warning(push)  
+# pragma warning(disable:4996) // 'std::equal': Function call with parameters that may be unsafe
+#endif
+
 #include <cstddef>
 #include <stdexcept>
 #include <boost/assert.hpp>
@@ -320,4 +327,9 @@
 
 } /* namespace boost */
 
+
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)  
+# pragma warning(pop)  
+#endif 
+
 #endif /*BOOST_ARRAY_HPP*/