From: Carl Hetherington Date: Tue, 9 Jun 2015 23:11:40 +0000 (+0100) Subject: Fix warnings. X-Git-Tag: v2.0.50~23 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=9bced5ab9be5f35c42627d4635c8e500cb5090fa;p=dcpomatic.git Fix warnings. --- diff --git a/test/ffmpeg_examiner_test.cc b/test/ffmpeg_examiner_test.cc index 26834aafc..a2f78c28a 100644 --- a/test/ffmpeg_examiner_test.cc +++ b/test/ffmpeg_examiner_test.cc @@ -37,6 +37,6 @@ BOOST_AUTO_TEST_CASE (ffmpeg_examiner_test) shared_ptr examiner (new FFmpegExaminer (content)); BOOST_CHECK_EQUAL (examiner->first_video().get(), ContentTime::from_seconds (600)); - BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1); + BOOST_CHECK_EQUAL (examiner->audio_streams().size(), 1U); BOOST_CHECK_EQUAL (examiner->audio_streams()[0]->first_audio.get(), ContentTime::from_seconds (600)); } diff --git a/test/test.cc b/test/test.cc index 5dd591ddc..0636c6e48 100644 --- a/test/test.cc +++ b/test/test.cc @@ -46,6 +46,7 @@ using std::min; using std::cout; using std::cerr; using std::list; +using std::abs; using boost::shared_ptr; using boost::scoped_array; @@ -143,7 +144,7 @@ check_audio_file (boost::filesystem::path ref, boost::filesystem::path check) BOOST_CHECK_EQUAL (r, this_time); for (sf_count_t i = 0; i < this_time; ++i) { - BOOST_REQUIRE (fabs (ref_buffer[i] - check_buffer[i]) <= 65536); + BOOST_REQUIRE (abs (ref_buffer[i] - check_buffer[i]) <= 65536); } N -= this_time; diff --git a/test/video_decoder_fill_test.cc b/test/video_decoder_fill_test.cc index 9ee00450d..85dafd93f 100644 --- a/test/video_decoder_fill_test.cc +++ b/test/video_decoder_fill_test.cc @@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE (video_decoder_fill_test1) ImageDecoder decoder (c); decoder.fill_2d (0, 4); - BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4); + BOOST_CHECK_EQUAL (decoder._decoded_video.size(), 4U); list::iterator i = decoder._decoded_video.begin(); for (int j = 0; j < 4; ++j) { BOOST_CHECK_EQUAL (i->frame, j);