BOOST_FOREACH.

[dcpomatic.git] / test / subtitle_reel_test.cc

diff --git a/test/subtitle_reel_test.cc b/test/subtitle_reel_test.cc
index 2938c6d104ad25c8887469a7b73f6653d846b51f..2eee36ffa3b463fa1899ce519fb3f41e435fc2d8 100644 (file)
--- a/test/subtitle_reel_test.cc
+++ b/test/subtitle_reel_test.cc
@@ -31,14 +31,13 @@
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/reel_closed_caption_asset.h>
 #include <dcp/reel_subtitle_asset.h>
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
 
 using std::list;
 using std::string;
 using boost::optional;
-using boost::shared_ptr;
+using std::shared_ptr;
 
 
 /* Check that timings are done correctly for multi-reel DCPs with PNG subs */
@@ -80,12 +79,12 @@ BOOST_AUTO_TEST_CASE (subtitle_reel_test)
        list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin ();
        BOOST_REQUIRE ((*i)->main_subtitle());
        BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-       shared_ptr<dcp::InteropSubtitleAsset> A = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+       shared_ptr<dcp::InteropSubtitleAsset> A = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
        BOOST_REQUIRE (A);
        ++i;
        BOOST_REQUIRE ((*i)->main_subtitle());
        BOOST_REQUIRE ((*i)->main_subtitle()->asset());
-       shared_ptr<dcp::InteropSubtitleAsset> B = boost::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
+       shared_ptr<dcp::InteropSubtitleAsset> B = std::dynamic_pointer_cast<dcp::InteropSubtitleAsset>((*i)->main_subtitle()->asset());
        BOOST_REQUIRE (B);
 
        BOOST_REQUIRE_EQUAL (A->subtitles().size(), 1U);
@@ -121,11 +120,11 @@ BOOST_AUTO_TEST_CASE (subtitle_in_all_reels_test)
 
        dcp::DCP dcp ("build/test/subtitle_in_all_reels_test/" + film->dcp_name());
        dcp.read ();
-       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
        shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
-       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3);
+       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
 
-       BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+       for (auto i: cpl->reels()) {
                BOOST_CHECK (i->main_subtitle());
        }
 }
@@ -166,12 +165,12 @@ BOOST_AUTO_TEST_CASE (closed_captions_in_all_reels_test)
 
        dcp::DCP dcp ("build/test/closed_captions_in_all_reels_test/" + film->dcp_name());
        dcp.read ();
-       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
        shared_ptr<dcp::CPL> cpl = dcp.cpls().front();
-       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3);
+       BOOST_REQUIRE_EQUAL (cpl->reels().size(), 3U);
 
-       BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
-               BOOST_REQUIRE_EQUAL (i->closed_captions().size(), 2);
+       for (auto i: cpl->reels()) {
+               BOOST_REQUIRE_EQUAL (i->closed_captions().size(), 2U);
                optional<string> first = i->closed_captions().front()->language();
                optional<string> second = i->closed_captions().back()->language();
                BOOST_REQUIRE (first);