From 42d80cd83800402cdb36fdb3457756dab5a24e63 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Nov 2012 09:25:23 +0000 Subject: Add clarification needed by newer GCC. --- asdcplib/src/MXFTypes.h | 4 ++-- 1 file changed, 2 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; -- cgit v1.2.3 From ea1e0300d6b0d4e3dbdcaaeb20affb5c3ae49214 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Nov 2012 09:25:32 +0000 Subject: Add missing virtual destructor. --- src/asset.h | 2 ++ 1 file changed, 2 insertions(+) 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. */ -- cgit v1.2.3 From 62aa8a18904a848cf58d39ce17df79d909a6927c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Nov 2012 09:25:47 +0000 Subject: Add msvcr100 link back in again. --- wscript | 1 + 1 file changed, 1 insertion(+) diff --git a/wscript b/wscript index 2ed1d8d6..204ab884 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') -- cgit v1.2.3 From a4c3ebbf5cf68910981930a796db19def208c476 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Nov 2012 09:26:10 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 204ab884..ef83ea73 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import lut APPNAME = 'libdcp' -VERSION = '0.26pre' +VERSION = '0.26' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 4b002140607903a5f29a25b6071949b169cf4cd2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 30 Nov 2012 09:27:09 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index ef83ea73..fb2dc4fe 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import lut APPNAME = 'libdcp' -VERSION = '0.26' +VERSION = '0.27pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3