From de32e9958d71ed16ebf1e5f8b2a9cf244c62d8c6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Oct 2015 13:00:48 +0100 Subject: [PATCH] Tweaks for Debian unstable. --- cscript | 2 ++ src/mxf.h | 2 +- src/reel_mxf.h | 2 +- src/ref.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cscript b/cscript index 900e1ed3..ee0fd96f 100644 --- a/cscript +++ b/cscript @@ -9,6 +9,8 @@ def build(target, options): cmd += ' --static' if target.distro == 'centos': cmd += ' --disable-tests' + if target.distro == 'debian' and target.version == 'unstable': + target.append_with_space('CXXFLAGS', '-std=c++11') elif target.platform == 'windows': cmd += ' --target-windows --disable-tests' elif target.platform == 'osx': diff --git a/src/mxf.h b/src/mxf.h index b4efd14f..f8be9844 100644 --- a/src/mxf.h +++ b/src/mxf.h @@ -52,7 +52,7 @@ public: /** @return true if the data is encrypted */ bool encrypted () const { - return _key_id; + return static_cast(_key_id); } /** Set the ID of the key that is used for encryption/decryption. diff --git a/src/reel_mxf.h b/src/reel_mxf.h index 6989a81f..4235392e 100644 --- a/src/reel_mxf.h +++ b/src/reel_mxf.h @@ -51,7 +51,7 @@ public: * that its content is encrypted. */ bool encrypted () const { - return _key_id; + return static_cast(_key_id); } /** @return Key ID to describe the key that encrypts this asset's diff --git a/src/ref.h b/src/ref.h index 8194e585..e2e2aa01 100644 --- a/src/ref.h +++ b/src/ref.h @@ -108,7 +108,7 @@ public: /** @return true if a shared_ptr is known for this Ref */ bool resolved () const { - return _object; + return static_cast(_object); } private: -- 2.30.2