From a721de0d004e443998907b9759ba54c6b5eb7dd3 Mon Sep 17 00:00:00 2001 From: zenith432 Date: Sat, 9 Dec 2017 10:41:48 +0000 Subject: [PATCH] BaseTools: silence parentheses-equality warning Some code generated by antlr causes clang to emit warning warning: equality comparison with extraneous parentheses [-Wparentheses-equality] The warning is suppressed specifically for clang without affecting other compilers. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Zenith432 Reviewed-by: Liming Gao (cherry picked from commit 4e97974c1e52c2fcd2640398b17266dff001b699) --- BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c | 1 + BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g | 1 + BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c | 2 ++ BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c index d0185b8fb5..8088b3c257 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.c @@ -41,6 +41,7 @@ ANTLR_INFO #pragma warn -aus /* unused assignment of 'xxx' */ #endif +#pragma clang diagnostic ignored "-Wparentheses-equality" #ifdef __USE_PROTOS static void chkToken(char *, char *, char *, int); diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g index e6eda6010c..e01728a102 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g +++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/antlr.g @@ -53,6 +53,7 @@ #pragma warn -aus /* unused assignment of 'xxx' */ #endif +#pragma clang diagnostic ignored "-Wparentheses-equality" #ifdef __USE_PROTOS static void chkToken(char *, char *, char *, int); diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c index af07c27eeb..51f79759fb 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.c @@ -39,6 +39,8 @@ Fix for Borland C++ 4.x & 5.x compiling with ALL warnings enabled #pragma warn -aus /* unused assignment of 'xxx' */ #endif +#pragma clang diagnostic ignored "-Wparentheses-equality" + int action_no = 0; /* keep track of actions outputted */ int nfa_allocated = 0; /* keeps track of number of nfa nodes */ nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */ diff --git a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g index 58ca110693..0e3fe6d9d7 100644 --- a/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g +++ b/BaseTools/Source/C/VfrCompile/Pccts/dlg/dlg_p.g @@ -42,7 +42,9 @@ #pragma warn -aus /* unused assignment of 'xxx' */ #endif -int action_no = 0; /* keep track of actions outputed */ +#pragma clang diagnostic ignored "-Wparentheses-equality" + +int action_no = 0; /* keep track of actions outputted */ int nfa_allocated = 0; /* keeps track of number of nfa nodes */ nfa_node **nfa_array = NULL;/* root of binary tree that stores nfa array */ nfa_node nfa_model_node; /* model to initialize new nodes */