summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-04-22 23:27:15 +0200
committerCarl Hetherington <cth@carlh.net>2022-04-22 23:27:15 +0200
commit3c29aa6531a4046a8db72dcac81189eb8893233c (patch)
treece2a134dab63df1711a135ae5732839ff293d958 /test
parent92364afecf76a87e1f96980cb1b91cf6f6a7522c (diff)
Use libdcp's warnings.h
Diffstat (limited to 'test')
-rw-r--r--test/stream_test.cc6
-rw-r--r--test/test.h1
2 files changed, 3 insertions, 4 deletions
diff --git a/test/stream_test.cc b/test/stream_test.cc
index 25c2d98a6..fe64e147e 100644
--- a/test/stream_test.cc
+++ b/test/stream_test.cc
@@ -25,11 +25,11 @@
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_audio_stream.h"
-#include "lib/warnings.h"
#include <libcxml/cxml.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <libxml++/libxml++.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
#include <boost/test/unit_test.hpp>
using std::pair;
diff --git a/test/test.h b/test/test.h
index 2b01db294..43bccd52b 100644
--- a/test/test.h
+++ b/test/test.h
@@ -19,7 +19,6 @@
*/
-#include "lib/warnings.h"
#include "lib/types.h"
#include <dcp/verify.h>
#include <boost/filesystem.hpp>