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/clucene | |
| 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/clucene')
| -rw-r--r-- | external/clucene/patches/clucene-warnings.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index 5f602c2ffa1c..dc20d198170c 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -5,7 +5,7 @@ #define _lucene_analysis_AnalysisHeader_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -18,7 +18,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -29,7 +29,7 @@ #define _lucene_search_Searcher_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -42,7 +42,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -53,7 +53,7 @@ #define _lucene_store_IndexInput_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -66,7 +66,7 @@ }; CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -77,7 +77,7 @@ #define _lucene_util_Array_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wunused-parameter" @@ -91,7 +91,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif @@ -102,7 +102,7 @@ #define _lucene_util_PriorityQueue_ +#include <config_global.h> -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -115,7 +115,7 @@ CL_NS_END + -+#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++#if defined(__GNUC__) +# pragma GCC diagnostic pop +#endif #endif |