summaryrefslogtreecommitdiff
path: root/src/lib/dkdm_wrapper.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-07-27 21:47:26 +0200
committerCarl Hetherington <cth@carlh.net>2020-07-27 21:47:26 +0200
commit2da4caba7871455c097c0ed940dd6f2332dbda5d (patch)
treef87883d0fcfe4c19ae5f7490306d49cc4f5d02b3 /src/lib/dkdm_wrapper.cc
parent94aadbd62c259a73d7511522dd167d519c68c5f9 (diff)
parent5d440e1133fc68dfffeaf53cf934b996dae811c7 (diff)
Merge branch 'warnings' into v2.15.x.
Clean up our handling of compiler warnings in a variety of ways, and use #pragma rather than -Wno to only disable warnings where necessary.
Diffstat (limited to 'src/lib/dkdm_wrapper.cc')
-rw-r--r--src/lib/dkdm_wrapper.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/dkdm_wrapper.cc b/src/lib/dkdm_wrapper.cc
index 0dd37b464..6638bc315 100644
--- a/src/lib/dkdm_wrapper.cc
+++ b/src/lib/dkdm_wrapper.cc
@@ -21,7 +21,10 @@
#include "compose.hpp"
#include "dkdm_wrapper.h"
#include "dcpomatic_assert.h"
+#include "warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/foreach.hpp>
using std::string;