summaryrefslogtreecommitdiff
path: root/boost/container/detail/config_begin.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'boost/container/detail/config_begin.hpp')
-rw-r--r--boost/container/detail/config_begin.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/boost/container/detail/config_begin.hpp b/boost/container/detail/config_begin.hpp
index bd44daacfe..83c2cfe40c 100644
--- a/boost/container/detail/config_begin.hpp
+++ b/boost/container/detail/config_begin.hpp
@@ -1,6 +1,6 @@
//////////////////////////////////////////////////////////////////////////////
//
-// (C) Copyright Ion Gaztanaga 2005-2011. Distributed under the Boost
+// (C) Copyright Ion Gaztanaga 2005-2012. Distributed under the Boost
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -45,4 +45,5 @@
// with /GR-; unpredictable behavior may result
#pragma warning (disable : 4673) // throwing '' the following types will not be considered at the catch site
#pragma warning (disable : 4671) // the copy constructor is inaccessible
+ #pragma warning (disable : 4584) // X is already a base-class of Y
#endif //BOOST_MSVC