summaryrefslogtreecommitdiffstats
path: root/external/boost/boost.multi_array.Wshadow.warnings.patch.2
diff options
context:
space:
mode:
Diffstat (limited to 'external/boost/boost.multi_array.Wshadow.warnings.patch.2')
-rw-r--r--external/boost/boost.multi_array.Wshadow.warnings.patch.246
1 files changed, 0 insertions, 46 deletions
diff --git a/external/boost/boost.multi_array.Wshadow.warnings.patch.2 b/external/boost/boost.multi_array.Wshadow.warnings.patch.2
deleted file mode 100644
index 1f8f0b5b8ed1..000000000000
--- a/external/boost/boost.multi_array.Wshadow.warnings.patch.2
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-