summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xasdcplib/src/MXFTypes.h4
-rw-r--r--src/asset.h2
-rw-r--r--wscript1
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.
*/
diff --git a/wscript b/wscript
index 13abb2a0..6ac2b076 100644
--- a/wscript
+++ b/wscript
@@ -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')