diff options
author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-07 02:31:51 +0100 |
---|---|---|
committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-07 02:31:51 +0100 |
commit | f6531b10353dacdcbab211a31926c165211cf3b3 (patch) | |
tree | b0c6508bb58b5a34e4b4f8007af5af44fd38aca1 /src/core/model/Domain.cpp | |
parent | 6b3b2f5965e5dfb2000bb9c23f11a83e175741de (diff) |
Unified handling of references to Rtti instances: Now using pointers everywhere
Diffstat (limited to 'src/core/model/Domain.cpp')
-rw-r--r-- | src/core/model/Domain.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp index 7d5a76e..55f05b3 100644 --- a/src/core/model/Domain.cpp +++ b/src/core/model/Domain.cpp @@ -61,7 +61,7 @@ bool FieldDescriptor::doValidate(Logger &logger) const if (getParent() == nullptr) { logger.error("This field has no parent!", *this); valid = false; - } else if (!getParent()->isa(RttiTypes::Descriptor)) { + } else if (!getParent()->isa(&RttiTypes::Descriptor)) { logger.error("The parent of this field is not a descriptor!", *this); valid = false; } @@ -142,7 +142,7 @@ bool Descriptor::doValidate(Logger &logger) const if (getParent() == nullptr) { logger.error("This Descriptor has no parent!", *this); valid = false; - } else if (!getParent()->isa(RttiTypes::Domain)) { + } else if (!getParent()->isa(&RttiTypes::Domain)) { logger.error("The parent of this Descriptor is not a Domain!", *this); valid = false; } @@ -180,7 +180,7 @@ bool Descriptor::continuePath(Handle<StructuredClass> target, // use recursive depth-first search from the top to reach the given child // get the list of effective FieldDescriptors. NodeVector<FieldDescriptor> fields; - if (isa(RttiTypes::StructuredClass)) { + if (isa(&RttiTypes::StructuredClass)) { const StructuredClass *tis = static_cast<const StructuredClass *>(this); fields = tis->getEffectiveFieldDescriptors(); } else { @@ -212,7 +212,7 @@ bool Descriptor::continuePath(Handle<StructuredClass> target, } } - if (isa(RttiTypes::StructuredClass)) { + if (isa(&RttiTypes::StructuredClass)) { const StructuredClass *tis = static_cast<const StructuredClass *>(this); // if this is a StructuredClass we also can call the subclasses. for (auto &c : tis->getSubclasses()) { @@ -489,7 +489,7 @@ bool Domain::doValidate(Logger &logger) const void Domain::doReference(Handle<Node> node) { - if (node->isa(RttiTypes::Domain)) { + if (node->isa(&RttiTypes::Domain)) { referenceTypesystem(node.cast<Typesystem>()); } } |