diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-14 15:54:22 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-14 16:03:22 +0100 |
| commit | 20803bd1dac462dedb670602c1ab4489f7f590fc (patch) | |
| tree | 62f97137397b7d11ed294ee37a3d846797ffe1e8 /external/clucene | |
| parent | 29661a886e4157e0cb6141b49fb5602fa621cc9a (diff) | |
clucene: stop using #pragma GCC system_header
... it breaks dependency generation.
Change-Id: I992e47ecea697617820358f711b7a6408fdabbe3
Diffstat (limited to 'external/clucene')
| -rw-r--r-- | external/clucene/patches/clucene-warnings.patch | 86 |
1 files changed, 76 insertions, 10 deletions
diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index b9676d90260c..1f1a29f5ab6e 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -1,54 +1,120 @@ --- src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:37:22.531637934 +0000 +++ src/core/CLucene/analysis/AnalysisHeader.h 2012-02-22 12:39:15.369916728 +0000 -@@ -7,6 +7,8 @@ +@@ -7,6 +7,12 @@ #ifndef _lucene_analysis_AnalysisHeader_ #define _lucene_analysis_AnalysisHeader_ -+#pragma GCC system_header ++#include <config_global.h> ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif + #include "CLucene/index/Payload.h" #include "CLucene/util/VoidList.h" #include "CLucene/LuceneThreads.h" +@@ -361,4 +361,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic pop ++#endif + #endif --- src/core/CLucene/search/Searchable.h 2012-02-22 12:37:22.513637729 +0000 +++ src/core/CLucene/search/Searchable.h 2012-02-22 12:38:51.073641550 +0000 -@@ -7,6 +7,7 @@ +@@ -7,6 +7,12 @@ #ifndef _lucene_search_Searcher_ #define _lucene_search_Searcher_ -+#pragma GCC system_header ++#include <config_global.h> ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif ++ //#include "CLucene/index/IndexReader.h" CL_CLASS_DEF(index,Term) +@@ -180,4 +180,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic pop ++#endif + #endif --- src/core/CLucene/store/IndexInput.h 2012-02-22 12:37:22.508637673 +0000 +++ src/core/CLucene/store/IndexInput.h 2012-02-22 12:39:00.465747935 +0000 -@@ -7,6 +7,8 @@ +@@ -7,6 +7,12 @@ #ifndef _lucene_store_IndexInput_ #define _lucene_store_IndexInput_ -+#pragma GCC system_header ++#include <config_global.h> ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Woverloaded-virtual" ++#endif + #include "CLucene/LuceneThreads.h" #include "CLucene/util/Equators.h" +@@ -195,4 +195,8 @@ + virtual void seekInternal(const int64_t pos) = 0; + }; + CL_NS_END ++ ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic pop ++#endif + #endif --- src/core/CLucene/util/Array.h 2012-02-22 12:37:22.510637696 +0000 +++ src/core/CLucene/util/Array.h 2012-02-22 12:38:33.714444884 +0000 -@@ -7,6 +7,8 @@ +@@ -7,6 +7,12 @@ #ifndef _lucene_util_Array_ #define _lucene_util_Array_ -+#pragma GCC system_header ++#include <config_global.h> ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wshadow" ++#endif + #include <stdlib.h> #include <string.h> +@@ -338,4 +338,8 @@ + + + CL_NS_END ++ ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic pop ++#endif + #endif --- src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:37:22.510637696 +0000 +++ src/core/CLucene/util/PriorityQueue.h 2012-02-22 12:38:40.316519685 +0000 -@@ -7,6 +7,8 @@ +@@ -7,6 +7,12 @@ #ifndef _lucene_util_PriorityQueue_ #define _lucene_util_PriorityQueue_ -+#pragma GCC system_header ++#include <config_global.h> ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wshadow" ++#endif + #include <stdlib.h> CL_NS_DEF(util) +@@ -199,4 +199,8 @@ + }; + + CL_NS_END ++ ++#if defined(__GNUC__) && HAVE_GCC_PRAGMA_DIAGNOSTIC_SCOPE ++# pragma GCC diagnostic pop ++#endif + #endif |