diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-11-30 23:50:45 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-11-30 23:50:45 +0000 |
| commit | 4aed3e564381267a36d8707b80f35cafba39fa98 (patch) | |
| tree | 25ce6422c6aa096b850f3be2d6859f759aec1b08 | |
| parent | ff3a1516f6c6750773e869089674fa60c305d175 (diff) | |
| parent | 4b002140607903a5f29a25b6071949b169cf4cd2 (diff) | |
Merge.
| -rwxr-xr-x | asdcplib/src/MXFTypes.h | 4 | ||||
| -rw-r--r-- | src/asset.h | 2 | ||||
| -rw-r--r-- | wscript | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/asdcplib/src/MXFTypes.h b/asdcplib/src/MXFTypes.h index bdf4e4c4..4ab67721 100755 --- a/asdcplib/src/MXFTypes.h +++ b/asdcplib/src/MXFTypes.h @@ -117,7 +117,7 @@ namespace ASDCP result = Tmp.Unarchive(Reader); if ( result ) - push_back(Tmp); + this->push_back(Tmp); } return result; @@ -192,7 +192,7 @@ namespace ASDCP { T Tmp; result = Tmp.Unarchive(Reader); - push_back(Tmp); + this->push_back(Tmp); } return result; diff --git a/src/asset.h b/src/asset.h index 492f16be..cc6fbcb7 100644 --- a/src/asset.h +++ b/src/asset.h @@ -49,6 +49,8 @@ public: */ Asset (std::string directory, std::string file_name = ""); + virtual ~Asset() {} + /** Write details of the asset to a CPL stream. * @param s Stream. */ @@ -19,6 +19,7 @@ def configure(conf): if conf.options.target_windows: conf.env.append_value('CXXFLAGS', '-DLIBDCP_WINDOWS') + conf.env.append_value('LIB', 'msvcr100') else: conf.env.append_value('CXXFLAGS', '-DLIBDCP_POSIX') |