diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-28 22:11:59 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-28 22:11:59 +0100 |
| commit | 5ff3c5ae8d983c68506b24b2740c0779832dc448 (patch) | |
| tree | 0991df04542d56404334923876d678725c329833 /src | |
| parent | 11c8f1e595a7d0c1c73b7a80cab22f2c5b92c606 (diff) | |
Build fixes for some GCC versions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mono_picture_frame.h | 5 | ||||
| -rw-r--r-- | src/stereo_picture_frame.h | 5 | ||||
| -rw-r--r-- | src/wscript | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h index 87c5d6ab..fa4f649b 100644 --- a/src/mono_picture_frame.h +++ b/src/mono_picture_frame.h @@ -74,7 +74,10 @@ public: int j2k_size () const; private: - friend MonoPictureAssetReader; + /* XXX: this is a bit of a shame, but I tried friend MonoPictureAssetReader and it's + rejected by some (seemingly older) GCCs. + */ + friend class AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>; MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, boost::shared_ptr<DecryptionContext>); diff --git a/src/stereo_picture_frame.h b/src/stereo_picture_frame.h index 42d88b3f..14c94e2e 100644 --- a/src/stereo_picture_frame.h +++ b/src/stereo_picture_frame.h @@ -70,7 +70,10 @@ public: int right_j2k_size () const; private: - friend StereoPictureAssetReader; + /* XXX: this is a bit of a shame, but I tried friend StereoPictureAssetReader and it's + rejected by some (seemingly older) GCCs. + */ + friend AssetReader<ASDCP::JP2K::MXFSReader, StereoPictureFrame>; StereoPictureFrame (ASDCP::JP2K::MXFSReader* reader, int n, boost::shared_ptr<DecryptionContext>); diff --git a/src/wscript b/src/wscript index b2a833c5..365f3df3 100644 --- a/src/wscript +++ b/src/wscript @@ -124,6 +124,7 @@ def build(bld): encryption_context.h exceptions.h font_asset.h + frame.h gamma_transfer_function.h interop_load_font_node.h interop_subtitle_asset.h |