From e83e799c027346681208c57181b28010d01c9b6e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 28 Jul 2020 22:04:55 +0200 Subject: [PATCH] Some more warning hiding. --- src/lib/warnings.h | 6 ++++-- src/wx/timing_panel.cc | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/warnings.h b/src/lib/warnings.h index d182526ff..278d284c9 100644 --- a/src/lib/warnings.h +++ b/src/lib/warnings.h @@ -24,13 +24,15 @@ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-copy\"") \ - _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") + _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \ + _Pragma("GCC diagnostic ignored \"-Waddress\"") #else #define DCPOMATIC_DISABLE_WARNINGS \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \ _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"") \ - _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") + _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"") \ + _Pragma("GCC diagnostic ignored \"-Waddress\"") #endif #define DCPOMATIC_ENABLE_WARNINGS \ diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index 973eacf5d..8db975d54 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -36,9 +36,12 @@ #include "lib/dcp_content.h" #include "lib/ffmpeg_content.h" #include +#include "lib/warnings.h" #if defined(__WXGTK20__) && !defined(__WXGTK3__) #define TIMING_PANEL_ALIGNMENT_HACK 1 +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #endif #include #include -- 2.30.2