New libcxml API.

[dcpomatic.git] / test / dcp_subtitle_test.cc

diff --git a/test/dcp_subtitle_test.cc b/test/dcp_subtitle_test.cc
index 4938cfb6dc1ee4759f54a1b9d53f94e562954fd7..1bde437638da801bfcc2472f287b644c84c08687 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,7 +40,8 @@
 
 using std::cout;
 using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::vector;
 using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
@@ -55,7 +56,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);
                }
        }
@@ -188,9 +189,9 @@ BOOST_AUTO_TEST_CASE (dcp_subtitle_test4)
 
 static
 void
-check_font_tags (list<cxml::NodePtr> nodes)
+check_font_tags (vector<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") != "");
                }