Warning fixes.

11 files changed, 20 insertions, 20 deletions

diff --git a/src/lib/audio_filter.h b/src/lib/audio_filter.h
index f361c27d2..0d9bcbacd 100644
--- 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 a0bbad06a..4c7ea4ba5 100644
--- 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 5e455d18a..3c85abd93 100644
--- 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 67839794b..13c33201e 100644
--- 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 b553cc42e..9f85c2dca 100644
--- 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 c9b4602ad..4e949d863 100644
--- 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 23c85e92b..6c5391641 100644
--- 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 7fbeebc8c..a3b745c8e 100644
--- 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 e7d21675f..7603a101d 100644
--- 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 57f5eb950..97649f4d5 100644
--- 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 dc7de8d54..27b36e9bc 100644
--- 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 ();