diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-28 23:42:28 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-28 23:42:28 +0100 |
| commit | b602b9ece41f0a876b5c5f1599af69cb45929b5f (patch) | |
| tree | f96ad84f99a06b964274e5c2b839922e8d7bd610 /src/mono_picture_frame.h | |
| parent | 5ff3c5ae8d983c68506b24b2740c0779832dc448 (diff) | |
Still more build fixes.
Diffstat (limited to 'src/mono_picture_frame.h')
| -rw-r--r-- | src/mono_picture_frame.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mono_picture_frame.h b/src/mono_picture_frame.h index fa4f649b..ed42b99f 100644 --- a/src/mono_picture_frame.h +++ b/src/mono_picture_frame.h @@ -31,12 +31,15 @@ files in the program, then also delete it here. */ +#ifndef LIBDCP_MONO_PICTURE_FRAME_H +#define LIBDCP_MONO_PICTURE_FRAME_H + /** @file src/mono_picture_frame.h * @brief MonoPictureFrame class. */ #include "types.h" -#include "mono_picture_asset_reader.h" +#include "asset_reader.h" #include <boost/shared_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/filesystem.hpp> @@ -77,7 +80,7 @@ private: /* 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>; + friend AssetReader<ASDCP::JP2K::MXFReader, MonoPictureFrame>; MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, boost::shared_ptr<DecryptionContext>); @@ -85,3 +88,5 @@ private: }; } + +#endif |