diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-05-16 18:16:48 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-05-17 01:41:20 +0000 |
| commit | 32a014a4f163f258a335ef86a61dca594f2891ac (patch) | |
| tree | 7cd7f8ce6f135292e7f9adfe3cbfc4bfea677ac6 /tools | |
| parent | 03af0ad7096734ed4ca72901ff857d3f9af50dc2 (diff) | |
Update the warning-suppression statements in idl2wrs.
Update them to use ws_diag_control.h and ws_compiler_tests.h, and the
DIAG_OFF() macros therein.
Regenerate the CORBA dissectors.
Change-Id: I26f0add0ec8dd920bfe80571b4141c1b0e2f0640
Reviewed-on: https://code.wireshark.org/review/33238
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/wireshark_gen.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index 2d7d412743..cc392e9ba5 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -2584,14 +2584,19 @@ for (i_@aname@=0; i_@aname@ < @aval@; i_@aname@++) { #include <epan/dissectors/packet-giop.h> #include <epan/expert.h> +#include "ws_diag_control.h" +#include "ws_compiler_tests.h" + #ifdef _MSC_VER /* disable warning: "unreference local variable" */ #pragma warning(disable:4101) #endif -#if defined(__GNUC__) -#pragma GCC diagnostic ignored "-Wunused-function" -#pragma GCC diagnostic ignored "-Wunused-variable" +/* XXX this should be autogenerated, or the warnings fixed in the generator */ +DIAG_OFF(unused-function) +DIAG_OFF(unused-variable) +#if WS_IS_AT_LEAST_GNUC_VERSION(6,0) +DIAG_OFF(unused-const-variable) #endif""" |