diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-12 19:39:57 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-12 19:39:57 +0100 |
| commit | 55f943ba1b31542157b984b5955b91261c280f46 (patch) | |
| tree | c0fe674adae1c19d5d4d46efd335cca35171c753 /src/core/model/Document.cpp | |
| parent | 9d89642e2bc33b8630e92d8b5a0e6d4116040897 (diff) | |
hopefully repaired multiple inheritance chaos.
Diffstat (limited to 'src/core/model/Document.cpp')
| -rw-r--r-- | src/core/model/Document.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/model/Document.cpp b/src/core/model/Document.cpp index 723aafd..022b91c 100644 --- a/src/core/model/Document.cpp +++ b/src/core/model/Document.cpp @@ -103,19 +103,17 @@ void Document::continueResolve(ResolutionState &state) /* Type registrations */ namespace RttiTypes { -const Rtti<model::DocumentEntity> DocumentEntity = - RttiBuilder("DocumentEntity").parent(&Node); const Rtti<model::Document> Document = RttiBuilder("Document").parent(&Node).composedOf( {&AnnotationEntity, &StructuredEntity}); -const Rtti<model::AnnotationEntity> AnnotationEntity = - RttiBuilder("AnnotationEntity").parent(&DocumentEntity).composedOf( - &StructuredEntity); const Rtti<model::StructureNode> StructureNode = RttiBuilder("StructureNode").parent(&Node); +const Rtti<model::AnnotationEntity> AnnotationEntity = + RttiBuilder("AnnotationEntity").parent(&Node).composedOf( + &StructureNode); const Rtti<model::StructuredEntity> StructuredEntity = - RttiBuilder("StructuredEntity").parent(&DocumentEntity).parent(&StructureNode).composedOf( - {&StructuredEntity, &Anchor, &DocumentPrimitive}); + RttiBuilder("StructuredEntity").parent(&StructureNode).composedOf( + {&StructureNode}); const Rtti<model::DocumentPrimitive> DocumentPrimitive = RttiBuilder("DocumentPrimitive").parent(&StructureNode); const Rtti<model::AnnotationEntity::Anchor> Anchor = |