From 5d7e556e478a5a301fd046c893542dabef36d82c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 1 Dec 2015 12:48:38 +0100 Subject: external/clucene: Use warning-supression pragmas for clang-cl, too Change-Id: I23da54974f39da5fccb619d6fa68eff38e70f5a5 --- external/clucene/patches/clucene-warnings.patch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'external') diff --git a/external/clucene/patches/clucene-warnings.patch b/external/clucene/patches/clucene-warnings.patch index 981215fbba23..fc3e322e9e8d 100644 --- a/external/clucene/patches/clucene-warnings.patch +++ b/external/clucene/patches/clucene-warnings.patch @@ -4,7 +4,7 @@ #ifndef _lucene_analysis_AnalysisHeader_ #define _lucene_analysis_AnalysisHeader_ -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -17,7 +17,7 @@ CL_NS_END + -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic pop +#endif #endif @@ -27,7 +27,7 @@ #ifndef _lucene_search_Searcher_ #define _lucene_search_Searcher_ -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -40,7 +40,7 @@ CL_NS_END + -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic pop +#endif #endif @@ -50,7 +50,7 @@ #ifndef _lucene_store_IndexInput_ #define _lucene_store_IndexInput_ -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif @@ -63,7 +63,7 @@ }; CL_NS_END + -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic pop +#endif #endif @@ -73,7 +73,7 @@ #ifndef _lucene_util_Array_ #define _lucene_util_Array_ -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +# pragma GCC diagnostic ignored "-Wunused-parameter" @@ -87,7 +87,7 @@ CL_NS_END + -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic pop +#endif #endif @@ -97,7 +97,7 @@ #ifndef _lucene_util_PriorityQueue_ #define _lucene_util_PriorityQueue_ -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wshadow" +#endif @@ -110,7 +110,7 @@ CL_NS_END + -+#if defined(__GNUC__) ++#if defined(__GNUC__) || defined __clang__ +# pragma GCC diagnostic pop +#endif #endif -- cgit