summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-26 19:54:34 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-26 21:30:59 +0200
commit0d711edad0694ee5f5c735b221d52387499e2d36 (patch)
tree47d349cb7285fac162d634fa666cae555a01f726
parent2370c03b83e1a074c6b7362885e69bc364553e49 (diff)
Disable warnings from magick.
-rw-r--r--src/lib/warnings.h3
-rw-r--r--test/test.h3
2 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/warnings.h b/src/lib/warnings.h
index e225c0339..bfb666e1b 100644
--- a/src/lib/warnings.h
+++ b/src/lib/warnings.h
@@ -20,7 +20,8 @@
#define DCPOMATIC_DISABLE_WARNINGS \
_Pragma("GCC diagnostic push") \
- _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
+ _Pragma("GCC diagnostic ignored \"-Wunused-parameter\"")
#define DCPOMATIC_ENABLE_WARNINGS \
_Pragma("GCC diagnostic pop")
diff --git a/test/test.h b/test/test.h
index 77108af46..b620a68a0 100644
--- a/test/test.h
+++ b/test/test.h
@@ -18,7 +18,10 @@
*/
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <Magick++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>