1 From d28b2bc733d85b0bb194f395375f2a460b9be00d Mon Sep 17 00:00:00 2001
2 From: Michael Stahl <mstahl@redhat.com>
3 Date: Wed, 30 Apr 2014 12:27:55 +0200
4 Subject: [PATCH] multi_array: suppress GCC -Wshadow warnings (fixes: #9886)
7 include/boost/multi_array.hpp | 9 +++++++++
8 1 file changed, 9 insertions(+)
10 diff --git a/include/boost/multi_array.hpp b/include/boost/multi_array.hpp
11 index 8193699..72b2294 100644
12 --- a/include/boost/multi_array.hpp
13 +++ b/include/boost/multi_array.hpp
15 // declaration and definition
18 +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
19 +# pragma GCC diagnostic push
20 +# pragma GCC diagnostic ignored "-Wshadow"
23 +#if defined(__clang__)
24 +# pragma clang diagnostic push
25 +# pragma clang diagnostic ignored "-Wshadow"
28 #include "boost/multi_array/base.hpp"
29 #include "boost/multi_array/collection_concept.hpp"
30 #include "boost/multi_array/copy_array.hpp"
31 @@ -496,4 +501,12 @@ private:
35 +#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406)
36 +# pragma GCC diagnostic pop
39 +#if defined(__clang__)
40 +# pragma clang diagnostic pop
43 #endif // BOOST_MULTI_ARRAY_RG071801_HPP