diff options
author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-18 15:30:18 +0100 |
---|---|---|
committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-18 15:30:18 +0100 |
commit | 8ab0709045667f8e1a67a9981c619980c9aebd1a (patch) | |
tree | f39812b3d216566de7c4dcdaacc7c607aa7e646c /src/core/model/Document.hpp | |
parent | cd55519130c5f91d95107b3b1e1a8203caa5008a (diff) | |
parent | 372c67e0844654362fc7d440b0b4a31500a6d02a (diff) |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Document.hpp')
-rw-r--r-- | src/core/model/Document.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/model/Document.hpp b/src/core/model/Document.hpp index 4b95079..b4ee429 100644 --- a/src/core/model/Document.hpp +++ b/src/core/model/Document.hpp @@ -501,6 +501,7 @@ class AnnotationEntity : public Node, public DocumentEntity { private: Owned<Anchor> start; Owned<Anchor> end; + protected: bool doValidate(Logger &logger) const override; @@ -556,7 +557,7 @@ private: NodeVector<AnnotationEntity> annotations; NodeVector<Domain> domains; - void continueResolve(ResolutionState &state) override; + void doResolve(ResolutionState &state) override; protected: bool doValidate(Logger &logger) const override; @@ -614,7 +615,7 @@ public: { domains.insert(domains.end(), d.begin(), d.end()); } - + /** * Returns true if and only if the given StructureNode is part of this * document, meaning that there is a path of parent references in the |