diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-02 18:15:41 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-02 20:00:18 +0200 |
| commit | 3b59dbbffdb73e48f9e2398bb1eecc24e3d95e13 (patch) | |
| tree | 8b58bba8c42110e10f6763b598f294bf7359b1f0 /external/boost/boost_1_44_0-clang-warnings.patch | |
| parent | 86cd29772e4f0571149c479378164572fbc96034 (diff) | |
remove HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE check and macro
This is supported in GCC 4.6.0 already:
https://gcc.gnu.org/onlinedocs/gcc-4.6.0/gcc/Diagnostic-Pragmas.html
Change-Id: I2f67e588eea3a323a2e9c81e39e56ab2e715a817
Diffstat (limited to 'external/boost/boost_1_44_0-clang-warnings.patch')
| -rw-r--r-- | external/boost/boost_1_44_0-clang-warnings.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/external/boost/boost_1_44_0-clang-warnings.patch b/external/boost/boost_1_44_0-clang-warnings.patch index d5b934b5f0ec..a71cc2f5a890 100644 --- a/external/boost/boost_1_44_0-clang-warnings.patch +++ b/external/boost/boost_1_44_0-clang-warnings.patch @@ -1,11 +1,10 @@ --- misc/boost_1_44_0/boost/random/lagged_fibonacci.hpp +++ misc/build/boost_1_44_0/boost/random/lagged_fibonacci.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_LAGGED_FIBONACCI_HPP #define BOOST_RANDOM_LAGGED_FIBONACCI_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -17,19 +16,18 @@ } // namespace boost -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // BOOST_RANDOM_LAGGED_FIBONACCI_HPP --- misc/boost_1_44_0/boost/random/shuffle_output.hpp +++ misc/build/boost_1_44_0/boost/random/shuffle_output.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_SHUFFLE_OUTPUT_HPP #define BOOST_RANDOM_SHUFFLE_OUTPUT_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -41,19 +39,18 @@ } } -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + #endif // BOOST_RANDOM_SHUFFLE_OUTPUT_HPP --- misc/boost_1_44_0/boost/random/subtract_with_carry.hpp +++ misc/build/boost_1_44_0/boost/random/subtract_with_carry.hpp -@@ -16,6 +16,12 @@ +@@ -16,6 +16,11 @@ #ifndef BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP #define BOOST_RANDOM_SUBTRACT_WITH_CARRY_HPP -+#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -65,7 +62,7 @@ } // namespace random } // namespace boost -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) +# pragma GCC diagnostic pop +#endif + |