Fix some macOS signed/unsigned warnings.

diff --git a/test/certificates_test.cc b/test/certificates_test.cc
index 0c671fc3cf8084ea67ec2a1ad7e410fc45b3c391..4795e45e55bda0a6f40fa81bb3419b904740d0a3 100644 (file)
--- a/test/certificates_test.cc
+++ b/test/certificates_test.cc
@@ -254,10 +254,10 @@ BOOST_AUTO_TEST_CASE (signer_validation)
 BOOST_AUTO_TEST_CASE (certificate_chain_from_string)
 {
        dcp::CertificateChain a (dcp::file_to_string (private_test / "chain.pem"));
-       BOOST_CHECK_EQUAL (a.root_to_leaf().size(), 3);
+       BOOST_CHECK_EQUAL (a.root_to_leaf().size(), 3U);
 
        dcp::CertificateChain b (dcp::file_to_string ("test/ref/crypt/leaf.signed.pem"));
-       BOOST_CHECK_EQUAL (b.root_to_leaf().size(), 1);
+       BOOST_CHECK_EQUAL (b.root_to_leaf().size(), 1U);
 }
 
 /** Check not_before and not_after */

diff --git a/test/cpl_metadata_test.cc b/test/cpl_metadata_test.cc
index 511098ea94ded234d4c01d269444567af28ce5db..b90aae4a9c40a1b5f9c15985fdc29c22d9172b7e 100644 (file)
--- a/test/cpl_metadata_test.cc
+++ b/test/cpl_metadata_test.cc
@@ -235,12 +235,12 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test1)
        BOOST_CHECK (cpl.main_picture_active_area().get() == dcp::Size(1440, 1080));
 
        auto reels = cpl.reels ();
-       BOOST_REQUIRE_EQUAL (reels.size(), 1);
+       BOOST_REQUIRE_EQUAL (reels.size(), 1U);
        BOOST_REQUIRE (reels.front()->main_subtitle()->language());
        BOOST_CHECK_EQUAL (reels.front()->main_subtitle()->language().get(), "de-DE");
 
        auto asl = cpl.additional_subtitle_languages();
-       BOOST_REQUIRE_EQUAL (asl.size(), 2);
+       BOOST_REQUIRE_EQUAL (asl.size(), 2U);
        BOOST_CHECK_EQUAL (asl[0], "en-US");
        BOOST_CHECK_EQUAL (asl[1], "fr-ZA");
 
@@ -408,7 +408,7 @@ BOOST_AUTO_TEST_CASE (cpl_metadata_read_test2)
        BOOST_CHECK (cpl.main_picture_active_area().get() == dcp::Size(1440, 1080));
 
        auto reels = cpl.reels ();
-       BOOST_REQUIRE_EQUAL (reels.size(), 1);
+       BOOST_REQUIRE_EQUAL (reels.size(), 1U);
 }
 
 

diff --git a/test/dcp_font_test.cc b/test/dcp_font_test.cc
index 361f5011fffee676aee8ef9f0fb03bfd00a22d09..f4db1c20fb4f79b05f46fa15d0772e18082771c0 100644 (file)
--- a/test/dcp_font_test.cc
+++ b/test/dcp_font_test.cc
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE (interop_dcp_font_test)
                dcp2.cpls()[0]->reels()[0]->main_subtitle()->asset_ref().asset()
                );
        BOOST_REQUIRE (subs2);
-       BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
+       BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1U);
 
        auto const size = boost::filesystem::file_size ("test/data/dummy.ttf");
        dcp::File f("test/data/dummy.ttf", "rb");
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (smpte_dcp_font_test)
                dcp2.cpls().front()->reels().front()->main_subtitle()->asset_ref().asset()
                );
        BOOST_REQUIRE (subs2);
-       BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1);
+       BOOST_REQUIRE_EQUAL (subs2->_fonts.size(), 1U);
 
        auto const size = boost::filesystem::file_size ("test/data/dummy.ttf");
        dcp::File f("test/data/dummy.ttf", "rb");

diff --git a/test/dcp_test.cc b/test/dcp_test.cc
index f36aa41f2a97a56d49f12d6403ed60452df301b6..7dc5ec3ed1220949a4c542d13ea07adfa8018e60 100644 (file)
--- a/test/dcp_test.cc
+++ b/test/dcp_test.cc
@@ -334,8 +334,8 @@ BOOST_AUTO_TEST_CASE (dcp_test6)
        dcp::DCP dcp ("test/ref/DCP/dcp_test5");
        dcp.read ();
 
-       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1);
-       BOOST_REQUIRE_EQUAL (dcp.cpls().front()->reels().size(), 1);
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 1U);
+       BOOST_REQUIRE_EQUAL (dcp.cpls()[0]->reels().size(), 1U);
        BOOST_CHECK (dcp.cpls().front()->reels().front()->main_picture());
        BOOST_CHECK (dcp.cpls().front()->reels().front()->main_sound());
        BOOST_CHECK (!dcp.cpls().front()->reels().front()->main_subtitle());
@@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE (dcp_test8)
        dcp::DCP dcp (private_test / "data/SMPTE_TST-B1PB2P_S_EN-EN-CCAP_5171-HI-VI_2K_ISDCF_20151123_DPPT_SMPTE_combo/");
        dcp.read ();
 
-       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2);
+       BOOST_REQUIRE_EQUAL (dcp.cpls().size(), 2U);
 }
 
 
@@ -458,11 +458,11 @@ BOOST_AUTO_TEST_CASE (dcp_add_kdm_test)
        auto kdm_1_uuid = dcp::make_uuid();
        kdm_1.add_key (dcp::DecryptedKDMKey(string("MDIK"), kdm_1_uuid, dcp::Key(), cpls[0]->id(), dcp::Standard::SMPTE));
        dcp.add (kdm_1);
-       BOOST_REQUIRE (reels[0]->_kdms.size() == 1);
-       BOOST_CHECK (reels[0]->_kdms[0].keys().size() == 1);
-       BOOST_CHECK (reels[0]->_kdms[0].keys()[0].id() == kdm_1_uuid);
-       BOOST_CHECK (reels[1]->_kdms.size() == 0);
-       BOOST_CHECK (reels[2]->_kdms.size() == 0);
+       BOOST_REQUIRE_EQUAL (reels[0]->_kdms.size(), 1U);
+       BOOST_CHECK_EQUAL (reels[0]->_kdms[0].keys().size(), 1U);
+       BOOST_CHECK_EQUAL (reels[0]->_kdms[0].keys()[0].id(), kdm_1_uuid);
+       BOOST_CHECK_EQUAL (reels[1]->_kdms.size(), 0U);
+       BOOST_CHECK_EQUAL (reels[2]->_kdms.size(), 0U);
 
        /* KDM with two keys that should be given to cpls[1] and cpls[2] */
 
@@ -475,13 +475,13 @@ BOOST_AUTO_TEST_CASE (dcp_add_kdm_test)
        /* Unchanged from previous test */
        BOOST_CHECK (reels[0]->_kdms.size() == 1);
        /* kdm_2 should have been added to both the other CPLs */
-       BOOST_REQUIRE (reels[1]->_kdms.size() == 1);
-       BOOST_REQUIRE (reels[1]->_kdms[0].keys().size() == 2);
-       BOOST_CHECK (reels[1]->_kdms[0].keys()[0].id() == kdm_2_uuid_1);
-       BOOST_CHECK (reels[1]->_kdms[0].keys()[1].id() == kdm_2_uuid_2);
-       BOOST_REQUIRE (reels[2]->_kdms.size() == 1);
-       BOOST_REQUIRE (reels[2]->_kdms[0].keys().size() == 2);
-       BOOST_CHECK (reels[2]->_kdms[0].keys()[0].id() == kdm_2_uuid_1);
-       BOOST_CHECK (reels[2]->_kdms[0].keys()[1].id() == kdm_2_uuid_2);
+       BOOST_REQUIRE_EQUAL (reels[1]->_kdms.size(), 1U);
+       BOOST_REQUIRE_EQUAL (reels[1]->_kdms[0].keys().size(), 2U);
+       BOOST_CHECK_EQUAL (reels[1]->_kdms[0].keys()[0].id(), kdm_2_uuid_1);
+       BOOST_CHECK_EQUAL (reels[1]->_kdms[0].keys()[1].id(), kdm_2_uuid_2);
+       BOOST_REQUIRE_EQUAL (reels[2]->_kdms.size(), 1U);
+       BOOST_REQUIRE_EQUAL (reels[2]->_kdms[0].keys().size(), 2U);
+       BOOST_CHECK_EQUAL (reels[2]->_kdms[0].keys()[0].id(), kdm_2_uuid_1);
+       BOOST_CHECK_EQUAL (reels[2]->_kdms[0].keys()[1].id(), kdm_2_uuid_2);
 }
 

diff --git a/test/interop_subtitle_test.cc b/test/interop_subtitle_test.cc
index 3369fc24f7fb7a02ce7347a52bdab0d4f2ccd8c1..7a7e26b624aa7aada1b839efe0e192eb0c20532b 100644 (file)
--- a/test/interop_subtitle_test.cc
+++ b/test/interop_subtitle_test.cc
@@ -60,14 +60,14 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
        BOOST_CHECK_EQUAL (subs.language(), "French");
 
        auto lfn = subs.load_font_nodes ();
-       BOOST_REQUIRE_EQUAL (lfn.size(), 1);
+       BOOST_REQUIRE_EQUAL (lfn.size(), 1U);
        shared_ptr<dcp::InteropLoadFontNode> interop_lfn = dynamic_pointer_cast<dcp::InteropLoadFontNode> (lfn.front ());
        BOOST_REQUIRE (interop_lfn);
        BOOST_CHECK_EQUAL (interop_lfn->id, "theFontId");
        BOOST_CHECK_EQUAL (interop_lfn->uri, "arial.ttf");
 
        auto s = subs.subtitles_during (dcp::Time (0, 0, 6, 1, 250), dcp::Time (0, 0, 6, 2, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFontId"),
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 0, 7, 190, 250), dcp::Time (0, 0, 7, 191, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFontId"),
@@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 0, 11, 95, 250), dcp::Time (0, 0, 11, 96, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 1);
+       BOOST_REQUIRE_EQUAL (s.size(), 1U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFontId"),
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test1)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 0, 14, 42, 250), dcp::Time (0, 0, 14, 43, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 1);
+       BOOST_REQUIRE_EQUAL (s.size(), 1U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.back()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.back()), dcp::SubtitleString (
                                   string ("theFontId"),
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
        dcp::InteropSubtitleAsset subs ("test/data/subs2.xml");
 
        auto s = subs.subtitles_during (dcp::Time (0, 0, 42, 100, 250), dcp::Time (0, 0, 42, 101, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 0, 50, 50, 250), dcp::Time (0, 0, 50, 51, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 2, 300, 250), dcp::Time (0, 1, 2, 301, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string("theFont"),
@@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 15, 50, 250), dcp::Time (0, 1, 15, 51, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -419,7 +419,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 27, 200, 250), dcp::Time (0, 1, 27, 201, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -468,7 +468,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 42, 300, 250), dcp::Time (0, 1, 42, 301, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -517,7 +517,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 45, 200, 250), dcp::Time (0, 1, 45, 201, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string("theFont"),
@@ -566,7 +566,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 1, 47, 249, 250), dcp::Time (0, 1, 47, 250, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -615,7 +615,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test2)
                                   ));
 
        s = subs.subtitles_during (dcp::Time (0, 2, 6, 210, 250), dcp::Time (0, 2, 6, 211, 250), false);
-       BOOST_REQUIRE_EQUAL (s.size(), 2);
+       BOOST_REQUIRE_EQUAL (s.size(), 2U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(s.front()));
        BOOST_CHECK_EQUAL (*dynamic_pointer_cast<const dcp::SubtitleString>(s.front()), dcp::SubtitleString (
                                   string ("theFont"),
@@ -669,7 +669,7 @@ BOOST_AUTO_TEST_CASE (read_interop_subtitle_test3)
 {
        dcp::InteropSubtitleAsset subs ("test/data/subs3.xml");
 
-       BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1);
+       BOOST_REQUIRE_EQUAL (subs.subtitles().size(), 1U);
        auto si = dynamic_pointer_cast<const dcp::SubtitleImage>(subs.subtitles().front());
        BOOST_REQUIRE (si);
        BOOST_CHECK (si->png_image() == dcp::ArrayData("test/data/sub.png"));

diff --git a/test/kdm_test.cc b/test/kdm_test.cc
index d5cd456f39268eb389fda64087cf14898b390530..bbc3439793f8f60c0bd74c4a2efd0ebbd48e20b1 100644 (file)
--- a/test/kdm_test.cc
+++ b/test/kdm_test.cc
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (kdm_test)
 
        auto keys = kdm.keys ();
 
-       BOOST_CHECK_EQUAL (keys.size(), 2);
+       BOOST_CHECK_EQUAL (keys.size(), 2U);
 
        BOOST_CHECK_EQUAL (keys.front().cpl_id(), "eece17de-77e8-4a55-9347-b6bab5724b9f");
        BOOST_CHECK_EQUAL (keys.front().id(), "4ac4f922-8239-4831-b23b-31426d0542c4");
@@ -198,7 +198,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test1)
        auto forensic = kdm_forensic_test(doc, true, 0);
        BOOST_REQUIRE (forensic);
        auto flags = forensic->node_children("ForensicMarkFlag");
-       BOOST_REQUIRE_EQUAL (flags.size(), 2);
+       BOOST_REQUIRE_EQUAL (flags.size(), 2U);
        BOOST_CHECK_EQUAL (flags.front()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable");
        BOOST_CHECK_EQUAL (flags.back()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable");
 }
@@ -211,7 +211,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test2)
        auto forensic = kdm_forensic_test(doc, true, optional<int>());
        BOOST_REQUIRE (forensic);
        auto flags = forensic->node_children("ForensicMarkFlag");
-       BOOST_REQUIRE_EQUAL (flags.size(), 1);
+       BOOST_REQUIRE_EQUAL (flags.size(), 1U);
        BOOST_CHECK_EQUAL (flags.front()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable");
 }
 
@@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test3)
        auto forensic = kdm_forensic_test(doc, false, 0);
        BOOST_REQUIRE (forensic);
        auto flags = forensic->node_children("ForensicMarkFlag");
-       BOOST_REQUIRE_EQUAL (flags.size(), 1);
+       BOOST_REQUIRE_EQUAL (flags.size(), 1U);
        BOOST_CHECK_EQUAL (flags.front()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable");
 }
 
@@ -235,7 +235,7 @@ BOOST_AUTO_TEST_CASE (kdm_forensic_test4)
        auto forensic = kdm_forensic_test(doc, true, 3);
        BOOST_REQUIRE (forensic);
        auto flags = forensic->node_children("ForensicMarkFlag");
-       BOOST_REQUIRE_EQUAL (flags.size(), 2);
+       BOOST_REQUIRE_EQUAL (flags.size(), 2U);
        BOOST_CHECK_EQUAL (flags.front()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-picture-disable");
        BOOST_CHECK_EQUAL (flags.back()->content(), "http://www.smpte-ra.org/430-1/2006/KDM#mrkflg-audio-disable-above-channel-3");
 }

diff --git a/test/markers_test.cc b/test/markers_test.cc
index c8293946ae0d182c937375da76780d6589f169df..f572ed015b80c63137acc3066700a97808314b32 100644 (file)
--- a/test/markers_test.cc
+++ b/test/markers_test.cc
@@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE (markers_write_test)
 BOOST_AUTO_TEST_CASE (markers_read_test, * boost::unit_test::depends_on("markers_write_test"))
 {
        dcp::CPL cpl ("build/test/markers_test.xml");
-       BOOST_CHECK_EQUAL (cpl.reels().size(), 1);
+       BOOST_CHECK_EQUAL (cpl.reels().size(), 1U);
        auto reel = cpl.reels().front();
        auto markers = reel->main_markers ();
        BOOST_REQUIRE (markers);

diff --git a/test/read_dcp_test.cc b/test/read_dcp_test.cc
index f995353efd0f59c70ce7688e027be3f5baf6efa8..d014bb8e5e71fa9c64a286d30b8807dbd83fe617 100644 (file)
--- a/test/read_dcp_test.cc
+++ b/test/read_dcp_test.cc
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE (read_dcp_test1)
        d.read ();
 
        auto cpls = d.cpls ();
-       BOOST_CHECK_EQUAL (cpls.size(), 1);
+       BOOST_CHECK_EQUAL (cpls.size(), 1U);
 
        BOOST_REQUIRE (cpls[0]->annotation_text());
        BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "A Test DCP");
@@ -63,7 +63,7 @@ BOOST_AUTO_TEST_CASE (read_dcp_test2)
        d.read ();
 
        auto cpls = d.cpls ();
-       BOOST_CHECK_EQUAL (cpls.size(), 1);
+       BOOST_CHECK_EQUAL (cpls.size(), 1U);
 
        BOOST_REQUIRE (cpls[0]->annotation_text());
        BOOST_CHECK_EQUAL (cpls[0]->annotation_text().get(), "Test_FTR-1_F-119_10_2K_20160524_IOP_OV");

diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index 69a4d612781c8ab75a3ed8b53e253a1e15772c00..3e359c0cbdaa3b83e76a57bc19bce83065bc4e99 100644 (file)
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
                );
 
        /* The 6 out-of-range samples should have been noted */
-       BOOST_REQUIRE_EQUAL (notes.size(), 6);
+       BOOST_REQUIRE_EQUAL (notes.size(), 6U);
        auto i = notes.begin ();
        BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
        BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");

diff --git a/test/shared_subtitle_test.cc b/test/shared_subtitle_test.cc
index ae05642a091bd96e297e3fece714e5ab57a06603..5d9ba9a44d947c0560dcbc89b830d599fbfca704 100644 (file)
--- a/test/shared_subtitle_test.cc
+++ b/test/shared_subtitle_test.cc
@@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (take_intersection_test)
        B._values["sheila"] = "baz";
 
        A.take_intersection (B);
-       BOOST_REQUIRE_EQUAL (A._values.size(), 1);
+       BOOST_REQUIRE_EQUAL (A._values.size(), 1U);
        BOOST_CHECK_EQUAL (A._values["foo"], "bar");
 
        A._values.clear ();
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (take_intersection_test)
        B._values["sheila"] = "baz";
 
        A.take_intersection (B);
-       BOOST_CHECK_EQUAL (A._values.size(), 0);
+       BOOST_CHECK_EQUAL (A._values.size(), 0U);
 }
 
 /** Test dcp::order::Font::take_difference */
@@ -98,7 +98,7 @@ BOOST_AUTO_TEST_CASE (take_difference_test)
        B._values["sheila"] = "baz";
 
        A.take_difference (B);
-       BOOST_REQUIRE_EQUAL (A._values.size(), 1);
+       BOOST_REQUIRE_EQUAL (A._values.size(), 1U);
        BOOST_CHECK_EQUAL (A._values["fred"], "jim");
 }
 
@@ -115,10 +115,10 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test1)
 
        dcp::SubtitleAsset::pull_fonts (root);
 
-       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2);
+       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2U);
        BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
        BOOST_CHECK_EQUAL (sub1->font._values["size"], "42");
-       BOOST_CHECK_EQUAL (text1->font._values.size(), 0);
+       BOOST_CHECK_EQUAL (text1->font._values.size(), 0U);
 }
 
 /** Test dcp::order::Subtitle::pull_fonts */
@@ -138,11 +138,11 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test2)
 
        dcp::SubtitleAsset::pull_fonts (root);
 
-       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 1);
+       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 1U);
        BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
-       BOOST_REQUIRE_EQUAL (text1->font._values.size(), 1);
+       BOOST_REQUIRE_EQUAL (text1->font._values.size(), 1U);
        BOOST_CHECK_EQUAL (text1->font._values["size"], "42");
-       BOOST_REQUIRE_EQUAL (text2->font._values.size(), 1);
+       BOOST_REQUIRE_EQUAL (text2->font._values.size(), 1U);
        BOOST_CHECK_EQUAL (text2->font._values["size"], "48");
 }
 
@@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE (pull_fonts_test3)
 
        dcp::SubtitleAsset::pull_fonts (root);
 
-       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2);
+       BOOST_REQUIRE_EQUAL (sub1->font._values.size(), 2U);
        BOOST_CHECK_EQUAL (sub1->font._values["font"], "Inconsolata");
        BOOST_CHECK_EQUAL (sub1->font._values["size"], "42");
 }

diff --git a/test/smpte_subtitle_test.cc b/test/smpte_subtitle_test.cc
index f1f66bfb645dd2e0f272c8abad9826a0564b8228..347681dee808001bf00aa07e9ffd6f23d867ccf5 100644 (file)
--- a/test/smpte_subtitle_test.cc
+++ b/test/smpte_subtitle_test.cc
@@ -105,12 +105,12 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test)
        BOOST_CHECK_EQUAL (sc.time_code_rate(), 25);
        BOOST_CHECK_EQUAL (sc.start_time(), dcp::Time (0, 0, 0, 0, 25));
        auto lfn = sc.load_font_nodes ();
-       BOOST_REQUIRE_EQUAL (lfn.size(), 1);
+       BOOST_REQUIRE_EQUAL (lfn.size(), 1U);
        shared_ptr<dcp::SMPTELoadFontNode> smpte_lfn = dynamic_pointer_cast<dcp::SMPTELoadFontNode> (lfn.front ());
        BOOST_REQUIRE (smpte_lfn);
        BOOST_CHECK_EQUAL (smpte_lfn->id, "theFontId");
        BOOST_CHECK_EQUAL (smpte_lfn->urn, "9118bbce-4105-4a05-b37c-a5a6f75e1fea");
-       BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63);
+       BOOST_REQUIRE_EQUAL (sc.subtitles().size(), 63U);
        BOOST_REQUIRE (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front()));
        BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->text(), "Noch mal.");
        BOOST_CHECK_EQUAL (dynamic_pointer_cast<const dcp::SubtitleString>(sc.subtitles().front())->space_before(), 0.0f);
@@ -130,7 +130,7 @@ BOOST_AUTO_TEST_CASE (read_smpte_subtitle_test2)
        dcp::SMPTESubtitleAsset sc (private_test / "olsson.xml");
 
        auto subs = sc.subtitles();
-       BOOST_REQUIRE_EQUAL (subs.size(), 6);
+       BOOST_REQUIRE_EQUAL (subs.size(), 6U);
        auto i = 0;
        auto is = dynamic_pointer_cast<const dcp::SubtitleString>(subs[i]);
        BOOST_REQUIRE (is);