diff options
| author | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-05-03 20:29:10 +0100 |
|---|---|---|
| committer | Andrzej Hunt <andrzej.hunt@collabora.com> | 2014-05-03 20:40:51 +0100 |
| commit | 74bb3cf5a9c768ae1e21e8469127e01f1aac67dd (patch) | |
| tree | de345686e7ac91ef350023fc1730c915b4ed97c4 /external/boost | |
| parent | dbbaa85d296d5c3ee9db42a132649570d977b429 (diff) | |
Add clang support for boost multi_array Wshadow patch.
ba54eca1817e84a1f1d1beec312ca87b8b059649 replaces the existing -Wshadow
fixes with a GCC pragma, however we also want to be able to build with clang.
Change-Id: I522f3c549adf65b98522561ab7167258dfda48b5
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/boost.multi_array.Wshadow.warnings.patch.2 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/external/boost/boost.multi_array.Wshadow.warnings.patch.2 b/external/boost/boost.multi_array.Wshadow.warnings.patch.2 index c73a3d13fb6c..1f8f0b5b8ed1 100644 --- a/external/boost/boost.multi_array.Wshadow.warnings.patch.2 +++ b/external/boost/boost.multi_array.Wshadow.warnings.patch.2 @@ -11,7 +11,7 @@ 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,11 @@ +@@ -18,6 +18,16 @@ // declaration and definition // @@ -20,10 +20,15 @@ index 8193699..72b2294 100644 +# 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,8 @@ private: +@@ -496,4 +501,12 @@ private: } // namespace boost @@ -31,6 +36,10 @@ index 8193699..72b2294 100644 +# pragma GCC diagnostic pop +#endif + ++#if defined(__clang__) ++# pragma clang diagnostic pop ++#endif ++ #endif // BOOST_MULTI_ARRAY_RG071801_HPP -- 1.8.3.1 |