From 88868ba0df022401394ae20b491a7f634276f38c Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 12 Jan 2010 05:55:52 +0000 Subject: [PATCH] Merged array changes from trunk to release [SVN r58921] --- include/boost/array.hpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/boost/array.hpp b/include/boost/array.hpp index 8ef73c4..d58b93a 100644 --- a/include/boost/array.hpp +++ b/include/boost/array.hpp @@ -24,6 +24,13 @@ #ifndef BOOST_ARRAY_HPP #define BOOST_ARRAY_HPP +#include + +#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 #include #include @@ -320,4 +327,9 @@ namespace boost { } /* namespace boost */ + +#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400) +# pragma warning(pop) +#endif + #endif /*BOOST_ARRAY_HPP*/