diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-20 23:34:44 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-20 23:34:44 +0100 |
| commit | e52f18d28d90c9deba31a441d566db94be0571b2 (patch) | |
| tree | 9c716e7a4a95ce2523272da3131cac17d00e5e03 | |
| parent | e4a1a0752cbf009c9fea6ac9f2f7fe1a53bc4245 (diff) | |
Fix some warnings.
| -rw-r--r-- | src/content.cc | 2 | ||||
| -rw-r--r-- | src/content.h | 4 | ||||
| -rw-r--r-- | src/picture_mxf.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/content.cc b/src/content.cc index 8a654670..265778bf 100644 --- a/src/content.cc +++ b/src/content.cc @@ -38,7 +38,7 @@ Content::Content (boost::filesystem::path file) } bool -Content::equals (shared_ptr<const Content> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const +Content::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const { if (!Asset::equals (other, opt, note)) { return false; diff --git a/src/content.h b/src/content.h index cf92f536..27939e83 100644 --- a/src/content.h +++ b/src/content.h @@ -33,7 +33,7 @@ #include <list> namespace ASDCP { - class WriterInfo; + struct WriterInfo; } namespace xmlpp { @@ -59,7 +59,7 @@ public: Content (boost::filesystem::path file); bool equals ( - boost::shared_ptr<const Content> other, + boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> ) const; diff --git a/src/picture_mxf.h b/src/picture_mxf.h index 5b76c116..bf8fcf76 100644 --- a/src/picture_mxf.h +++ b/src/picture_mxf.h @@ -31,7 +31,7 @@ namespace ASDCP { namespace JP2K { - class PictureDescriptor; + struct PictureDescriptor; } } |