X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Faudio_merger_test.cc;h=3a274ff1aeb8ba2d21f1c72d88b458d93d9ea5b0;hp=2ac42964ad80318732cc6dc5a19e59e2054fcdf2;hb=b29eb5107c5e77fe01e43010e1582e733f6ceea1;hpb=cd92063f7c67093ac789cb3aa78e534a3a85ef92 diff --git a/test/audio_merger_test.cc b/test/audio_merger_test.cc index 2ac42964a..3a274ff1a 100644 --- a/test/audio_merger_test.cc +++ b/test/audio_merger_test.cc @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1) push (merger, 0, 64, 22); list, DCPTime> > tb = merger.pull (DCPTime::from_frames (22, sampling_rate)); - BOOST_REQUIRE (tb.size() == 1); + BOOST_REQUIRE (tb.size() == 1U); BOOST_CHECK (tb.front().first != shared_ptr ()); BOOST_CHECK_EQUAL (tb.front().first->frames(), 22); BOOST_CHECK_EQUAL (tb.front().second.get(), 0); @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test1) } tb = merger.pull (DCPTime::from_frames (22 + 64, sampling_rate)); - BOOST_REQUIRE (tb.size() == 1); + BOOST_REQUIRE (tb.size() == 1U); BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(22, sampling_rate).get()); @@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test2) /* There's nothing from 0 to 9 */ list, DCPTime> > tb = merger.pull (DCPTime::from_frames (9, sampling_rate)); - BOOST_CHECK_EQUAL (tb.size(), 0); + BOOST_CHECK_EQUAL (tb.size(), 0U); /* Then there's our data at 9 */ tb = merger.pull (DCPTime::from_frames (9 + 64, sampling_rate)); @@ -125,7 +125,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3) /* Get them back */ list, DCPTime> > tb = merger.pull (DCPTime::from_frames (100, sampling_rate)); - BOOST_REQUIRE (tb.size() == 1); + BOOST_REQUIRE (tb.size() == 1U); BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(17, sampling_rate).get()); for (int i = 0; i < 64; ++i) { @@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (audio_merger_test3) } tb = merger.pull (DCPTime::from_frames (200, sampling_rate)); - BOOST_REQUIRE (tb.size() == 1); + BOOST_REQUIRE (tb.size() == 1U); BOOST_CHECK_EQUAL (tb.front().first->frames(), 64); BOOST_CHECK_EQUAL (tb.front().second.get(), DCPTime::from_frames(114, sampling_rate).get()); for (int i = 0; i < 64; ++i) {