BOOST_FOREACH.

[dcpomatic.git] / test / dcp_subtitle_test.cc

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 64800c100e00df70ca427ae29e49eb24be172157..025d33c6aae04d07c8f6159da2996dc28e206fe0 100644 (file)
--- 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;
@@ -52,7 +55,7 @@ store (ContentStringText sub)
        if (!stored) {
                stored = sub;
        } else {
-               BOOST_FOREACH (dcp::SubtitleString i, sub.subs) {
+               for (auto i: sub.subs) {
                        stored->subs.push_back (i);
                }
        }
@@ -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(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,14 +183,14 @@ 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
 void
 check_font_tags (list<cxml::NodePtr> nodes)
 {
-       BOOST_FOREACH (cxml::NodePtr i, nodes) {
+       for (auto i: nodes) {
                if (i->name() == "Font") {
                        BOOST_CHECK (!i->optional_string_attribute("Id") || i->string_attribute("Id") != "");
                }
@@ -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());