diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-07-28 22:04:55 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-07-28 22:04:55 +0200 |
| commit | e83e799c027346681208c57181b28010d01c9b6e (patch) | |
| tree | 23439a74619170884f752eca852e2cbd15a4f11c | |
| parent | cada1f6449cd8bcf848315a2a3da9125a15d71f3 (diff) | |
Some more warning hiding.
| -rw-r--r-- | src/lib/warnings.h | 6 | ||||
| -rw-r--r-- | 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 <dcp/locale_convert.h> +#include "lib/warnings.h" #if defined(__WXGTK20__) && !defined(__WXGTK3__) #define TIMING_PANEL_ALIGNMENT_HACK 1 +DCPOMATIC_DISABLE_WARNINGS #include <gtk/gtk.h> +DCPOMATIC_ENABLE_WARNINGS #endif #include <boost/foreach.hpp> #include <set> |