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