Try to fix some warnings on OS X.

diff --git a/src/lib/audio_mapping.cc b/src/lib/audio_mapping.cc
index fc3909a8aa0ab5240dd7d17b968bf102e2783d70..ca175912b31c0b7969933622d2b49751b0b2bece 100644 (file)
--- 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 ea6c54eadabb75188cc576d71d92e76698043bd7..4dce27d4aaec1958344c7fdd4f379489803a9f85 100644 (file)
--- 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 b4f37dd0bb6ffa197c0589022b6eae9a74a9e640..98c7bf9e2acffea10a4d24f5419794da987b1b79 100644 (file)
--- 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 b6f864f8250e9762f0975eb16e6e79b38af8e360..aadde36363e0d4bef8f684c0a290d9ab44e76a2b 100644 (file)
--- 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);
 }