From 0232d80a625b2ffae687e6473ab3fc2603cf87ea Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 22 Feb 2024 22:51:44 +0100
Subject: Allow building with C++17 and updated libxml++/pangomm/cairomm.

---
 test/film_metadata_test.cc | 2 +-
 test/test.cc               | 4 ++--
 test/test.h                | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc
index 878e60254..2bd60dc81 100644
--- a/test/film_metadata_test.cc
+++ b/test/film_metadata_test.cc
@@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test)
 	film->set_audio_channels(6);
 	film->write_metadata ();
 
-	list<string> ignore = { "Key", "ContextID", "LastWrittenBy" };
+	list<Glib::ustring> ignore = { "Key", "ContextID", "LastWrittenBy" };
 	check_xml ("test/data/metadata.xml.ref", dir.string() + "/metadata.xml", ignore);
 
 	auto g = make_shared<Film>(dir);
diff --git a/test/test.cc b/test/test.cc
index 57f4ae203..9ab7fe480 100644
--- a/test/test.cc
+++ b/test/test.cc
@@ -584,7 +584,7 @@ check_dcp(boost::filesystem::path ref, boost::filesystem::path check, bool sound
 }
 
 void
-check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
+check_xml(xmlpp::Element* ref, xmlpp::Element* test, list<Glib::ustring> ignore)
 {
 	BOOST_CHECK_EQUAL (ref->get_name (), test->get_name ());
 	BOOST_CHECK_EQUAL (ref->get_namespace_prefix (), test->get_namespace_prefix ());
@@ -640,7 +640,7 @@ check_xml (xmlpp::Element* ref, xmlpp::Element* test, list<string> ignore)
 }
 
 void
-check_xml (boost::filesystem::path ref, boost::filesystem::path test, list<string> ignore)
+check_xml(boost::filesystem::path ref, boost::filesystem::path test, list<Glib::ustring> ignore)
 {
 	auto ref_parser = new xmlpp::DomParser(ref.string());
 	auto ref_root = ref_parser->get_document()->get_root_node();
diff --git a/test/test.h b/test/test.h
index 6687affea..0776d6e5a 100644
--- a/test/test.h
+++ b/test/test.h
@@ -22,6 +22,7 @@
 #include "lib/video_frame_type.h"
 #include <dcp/types.h>
 #include <dcp/verify.h>
+#include <glibmm.h>
 #include <boost/filesystem.hpp>
 #include <vector>
 
@@ -66,7 +67,7 @@ extern void check_text_file (boost::filesystem::path ref, boost::filesystem::pat
 extern void check_wav_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern void check_mxf_audio_file (boost::filesystem::path ref, boost::filesystem::path check);
 extern bool mxf_atmos_files_same (boost::filesystem::path ref, boost::filesystem::path check, bool verbose = false);
-extern void check_xml (boost::filesystem::path, boost::filesystem::path, std::list<std::string>);
+extern void check_xml(boost::filesystem::path, boost::filesystem::path, std::list<Glib::ustring>);
 extern void check_ffmpeg (boost::filesystem::path, boost::filesystem::path, int audio_tolerance);
 extern void check_image (boost::filesystem::path, boost::filesystem::path, double threshold = 4);
 extern boost::filesystem::path test_film_dir (std::string);
-- 
cgit v1.2.3