From 14041ef630167395db437314a296b40ce2754d95 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sat, 22 Jul 2017 18:03:58 +0100 Subject: IceUtil::Shared should be virtually inheritted --- slicer/slicer/modelParts.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/slicer/slicer/modelParts.h b/slicer/slicer/modelParts.h index dab66b1..e0f49c4 100644 --- a/slicer/slicer/modelParts.h +++ b/slicer/slicer/modelParts.h @@ -28,7 +28,7 @@ namespace Slicer { public: virtual void get(const T &) const = 0; }; - class ValueTarget : public IceUtil::Shared, + class ValueTarget : virtual public IceUtil::Shared, public TValueTarget, public TValueTarget, public TValueTarget, @@ -54,7 +54,7 @@ namespace Slicer { public: virtual void set(T &) const = 0; }; - class ValueSource : public IceUtil::Shared, + class ValueSource : virtual public IceUtil::Shared, public TValueSource, public TValueSource, public TValueSource, @@ -103,14 +103,14 @@ namespace Slicer { mpt_Dictionary, }; - class ChildRef : public IceUtil::Shared { + class ChildRef : virtual public IceUtil::Shared { public: virtual ModelPartPtr Child() const = 0; virtual const Metadata & ChildMetaData() const = 0; }; typedef IceUtil::Handle ChildRefPtr; - class DLL_PUBLIC HookCommon : public IceUtil::Shared { + class DLL_PUBLIC HookCommon : virtual public IceUtil::Shared { public: HookCommon(const std::string &); @@ -146,7 +146,7 @@ namespace Slicer { const Metadata & mdr; }; - class DLL_PUBLIC ModelPart : public IceUtil::Shared { + class DLL_PUBLIC ModelPart : virtual public IceUtil::Shared { public: virtual ~ModelPart() = default; -- cgit v1.2.3