summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2017-07-22 18:03:58 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2017-07-22 18:03:58 +0100
commit14041ef630167395db437314a296b40ce2754d95 (patch)
tree4117c74dae953ae57e7f62fe17bcaec6318dc66b
parentMove some generated conversion code into impl.h (diff)
downloadslicer-14041ef630167395db437314a296b40ce2754d95.tar.bz2
slicer-14041ef630167395db437314a296b40ce2754d95.tar.xz
slicer-14041ef630167395db437314a296b40ce2754d95.zip
IceUtil::Shared should be virtually inheritted
-rw-r--r--slicer/slicer/modelParts.h10
1 files 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<bool>,
public TValueTarget<Ice::Byte>,
public TValueTarget<Ice::Short>,
@@ -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<bool>,
public TValueSource<Ice::Byte>,
public TValueSource<Ice::Short>,
@@ -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<ChildRef> 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;