Warning fixes.

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index f361c27d2cf837508e53887ec7b97600b9310b68..0d9bcbacdb1201a40b62feaac606ffcc16b8d2a9 100644 (file)
--- a/src/lib/audio_filter.h
+++ b/src/lib/audio_filter.h
@@ -40,8 +40,8 @@ public:
        void flush ();
 
 protected:
-       friend class audio_filter_impulse_kernel_test;
-       friend class audio_filter_impulse_input_test;
+       friend struct audio_filter_impulse_kernel_test;
+       friend struct audio_filter_impulse_input_test;
 
        std::vector<float> sinc_blackman (float cutoff, bool invert) const;
 

diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index a0bbad06aeaeeed6530d214551fcbd82ab3a4d4d..4c7ea4ba52d524746ac9acb064ae6700d0d8ca35 100644 (file)
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -97,7 +97,7 @@ public:
        }
 
 protected:
-       friend class dcptime_round_up_test;
+       friend struct dcptime_round_up_test;
        
        Type _t;
        static const int HZ = 96000;

diff --git a/src/lib/ffmpeg_audio_stream.h b/src/lib/ffmpeg_audio_stream.h
index 5e455d18aa086f26d6ae9a644d07c2b5005ac0f5..3c85abd93c568a0911262798a34622d62db06197 100644 (file)
--- a/src/lib/ffmpeg_audio_stream.h
+++ b/src/lib/ffmpeg_audio_stream.h
@@ -45,7 +45,7 @@ public:
        boost::optional<ContentTime> first_audio;
 
 private:
-       friend class ffmpeg_pts_offset_test;
+       friend struct ffmpeg_pts_offset_test;
 
        /* Constructor for tests */
        FFmpegAudioStream ()

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 67839794b97945496f4158f7379349794273fa66..13c33201e3275bcfb427eea46c62eae7cc32de78 100644 (file)
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -114,7 +114,7 @@ public:
        std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
 
 private:
-       friend class ffmpeg_pts_offset_test;
+       friend struct ffmpeg_pts_offset_test;
        
        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
        boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index b553cc42ea2cc15627f99f5ee9cd35cdfffb6f39..9f85c2dca8e5e2d9fc66045cd694dab07c12fb90 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -50,7 +50,7 @@ public:
        FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
 
 private:
-       friend class ::ffmpeg_pts_offset_test;
+       friend struct ::ffmpeg_pts_offset_test;
 
        void seek (ContentTime time, bool);
        bool pass ();

diff --git a/src/lib/film.h b/src/lib/film.h
index c9b4602ad52b9329c5524dab3e06dd7a95c89f99..4e949d863330ed1ce8aa4d4889792be5c3996c28 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -283,7 +283,7 @@ public:
 
 private:
 
-       friend class ::isdcf_name_test;
+       friend struct ::isdcf_name_test;
 
        void signal_changed (Property);
        std::string video_identifier () const;
@@ -339,8 +339,8 @@ private:
        /** true if our state has changed since we last saved it */
        mutable bool _dirty;
 
-       friend class paths_test;
-       friend class film_metadata_test;
+       friend struct paths_test;
+       friend struct film_metadata_test;
 };
 
 #endif

diff --git a/src/lib/image.h b/src/lib/image.h
index 23c85e92b044d1371650805ee6364b49a9063165..6c539164109a883e40b864a108a2a90810fd9fc3 100644 (file)
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -78,7 +78,7 @@ public:
        std::string digest () const;
 
 private:
-       friend class pixel_formats_test;
+       friend struct pixel_formats_test;
        
        void allocate ();
        void swap (Image &);

diff --git a/src/lib/player.h b/src/lib/player.h
index 7fbeebc8c2f4432c85bd101fc3c2bea18ae0fc12..a3b745c8e4ca69acd641cb106be7b733ca19e7da 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -106,7 +106,7 @@ public:
 private:
        friend class PlayerWrapper;
        friend class Piece;
-       friend class player_overlaps_test;
+       friend struct player_overlaps_test;
 
        void setup_pieces ();
        void playlist_changed ();

diff --git a/src/lib/subrip.h b/src/lib/subrip.h
index e7d21675f41e140e11777d750e64087855d4c680..7603a101de4a07a69588da726e924a5f1ad1529e 100644 (file)
--- a/src/lib/subrip.h
+++ b/src/lib/subrip.h
@@ -39,10 +39,10 @@ protected:
        std::vector<SubRipSubtitle> _subtitles;
        
 private:
-       friend class subrip_time_test;
-       friend class subrip_coordinate_test;
-       friend class subrip_content_test;
-       friend class subrip_parse_test;
+       friend struct subrip_time_test;
+       friend struct subrip_coordinate_test;
+       friend struct subrip_content_test;
+       friend struct subrip_parse_test;
        
        static ContentTime convert_time (std::string);
        static int convert_coordinate (std::string);

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index 57f5eb9509264d68957ac8f99ef282932cbb28f9..97649f4d525590a2ad1fdb333a6b789bad9087e1 100644 (file)
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -76,7 +76,7 @@ public:
        }
 
 private:
-       friend class ffmpeg_pts_offset_test;
+       friend struct ffmpeg_pts_offset_test;
 
        bool _use_subtitles;
        /** x offset for placing subtitles, as a proportion of the container width;

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index dc7de8d54a7f557ff2b70fe951b6cabaa98975d0..27b36e9bc65ed73358ae36ef2da2adb32c607f77 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -182,10 +182,10 @@ protected:
        float _video_frame_rate;
 
 private:
-       friend class ffmpeg_pts_offset_test;
-       friend class best_dcp_frame_rate_test_single;
-       friend class best_dcp_frame_rate_test_double;
-       friend class audio_sampling_rate_test;
+       friend struct ffmpeg_pts_offset_test;
+       friend struct best_dcp_frame_rate_test_single;
+       friend struct best_dcp_frame_rate_test_double;
+       friend struct audio_sampling_rate_test;
 
        void setup_default_colour_conversion ();