X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fdcp_subtitle_test.cc;h=a3ef673fea82e35d694e9393f5f946cfeeb8bac1;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=80dacbb473dc161fa43a6096e83c351e3ccd1a70;hpb=5ff6b15ef3c58a046fb9eec0273c5e7322988a14;p=dcpomatic.git

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 80dacbb47..a3ef673fe 100644
--- a/test/dcp_subtitle_test.cc
+++ b/test/dcp_subtitle_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/dcp_subtitle_test.cc
  *  @brief Test DCP subtitle content in various ways.
- *  @ingroup specific
+ *  @ingroup feature
  */
 
 #include <boost/test/unit_test.hpp>
@@ -40,8 +40,11 @@
 
 using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 optional<ContentStringText> stored;
@@ -87,7 +90,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR"));
 	film->set_name ("frobozz");
-	shared_ptr<DCPContent> content (new DCPContent(TestPaths::private_data / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
+	shared_ptr<DCPContent> content (new DCPContent(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"));
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs ());
 
@@ -98,7 +101,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_within_dcp_test)
 	while (!decoder->pass() && !stored) {}
 
 	BOOST_REQUIRE (stored);
-	BOOST_REQUIRE_EQUAL (stored->subs.size(), 2);
+	BOOST_REQUIRE_EQUAL (stored->subs.size(), 2U);
 	BOOST_CHECK_EQUAL (stored->subs.front().text(), "Noch mal.");
 	BOOST_CHECK_EQUAL (stored->subs.back().text(), "Encore une fois.");
 }
@@ -180,7 +183,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
 
 	cxml::Document doc ("DCSubtitle");
 	doc.read_file (subtitle_file (film));
-	BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+	BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1U);
 }
 
 static
@@ -213,7 +216,7 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test5)
 
 	cxml::Document doc ("DCSubtitle");
 	doc.read_file (subtitle_file(film));
-	BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1);
+	BOOST_REQUIRE_EQUAL (doc.node_children("LoadFont").size(), 1U);
 	BOOST_CHECK (doc.node_children("LoadFont").front()->string_attribute("Id") != "");
 
 	check_font_tags (doc.node_children());