diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-04 10:58:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-04 10:58:47 +0100 |
| commit | 615762376308039521e8030797d496ad8d09206e (patch) | |
| tree | abe9456e0e75bcc9cf61d06742191a9d339474ad | |
| parent | 2cccb35bbd513737a8f87566e981fa39fea87d04 (diff) | |
Try to fix some warnings on OS X.
| -rw-r--r-- | src/lib/audio_mapping.cc | 1 | ||||
| -rw-r--r-- | src/lib/audio_stream.h | 2 | ||||
| -rw-r--r-- | test/ffmpeg_decoder_sequential_test.cc | 2 | ||||
| -rw-r--r-- | test/player_test.cc | 10 |
4 files changed, 8 insertions, 7 deletions
diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc index fc3909a8a..ca175912b 100644 --- a/src/lib/audio_mapping.cc +++ b/src/lib/audio_mapping.cc @@ -31,6 +31,7 @@ using std::pair; using std::string; using std::min; using std::vector; +using std::abs; using boost::shared_ptr; using boost::dynamic_pointer_cast; diff --git a/src/lib/audio_stream.h b/src/lib/audio_stream.h index ea6c54ead..4dce27d4a 100644 --- a/src/lib/audio_stream.h +++ b/src/lib/audio_stream.h @@ -23,7 +23,7 @@ #include "audio_mapping.h" #include <boost/thread/mutex.hpp> -class audio_sampling_rate_test; +struct audio_sampling_rate_test; class AudioStream { diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index b4f37dd0b..98c7bf9e2 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -61,7 +61,7 @@ test (boost::filesystem::path file, float fps, int gaps) for (Frame i = 0; i < N; ++i) { list<ContentVideo> v; v = decoder->get_video (i, true); - BOOST_CHECK_EQUAL (v.size(), 1); + BOOST_CHECK_EQUAL (v.size(), 1U); BOOST_CHECK_EQUAL (v.front().frame, i); } #ifdef DCPOMATIC_DEBUG diff --git a/test/player_test.cc b/test/player_test.cc index b6f864f82..aadde3636 100644 --- a/test/player_test.cc +++ b/test/player_test.cc @@ -58,23 +58,23 @@ BOOST_AUTO_TEST_CASE (player_overlaps_test) shared_ptr<Player> player = film->make_player (); list<shared_ptr<Piece> > o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5)); - BOOST_CHECK_EQUAL (o.size(), 1); + BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, A); o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8)); - BOOST_CHECK_EQUAL (o.size(), 0); + BOOST_CHECK_EQUAL (o.size(), 0U); o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12)); - BOOST_CHECK_EQUAL (o.size(), 1); + BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, B); o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12)); - BOOST_CHECK_EQUAL (o.size(), 2); + BOOST_CHECK_EQUAL (o.size(), 2U); BOOST_CHECK_EQUAL (o.front()->content, A); BOOST_CHECK_EQUAL (o.back()->content, B); o = player->overlaps<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11)); - BOOST_CHECK_EQUAL (o.size(), 1); + BOOST_CHECK_EQUAL (o.size(), 1U); BOOST_CHECK_EQUAL (o.front()->content, B); } |