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/Domain.hpp | |
| parent | cd55519130c5f91d95107b3b1e1a8203caa5008a (diff) | |
| parent | 372c67e0844654362fc7d440b0b4a31500a6d02a (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Domain.hpp')
| -rw-r--r-- | src/core/model/Domain.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp index 5cc7874..d1ba44f 100644 --- a/src/core/model/Domain.hpp +++ b/src/core/model/Domain.hpp @@ -390,7 +390,7 @@ private: std::vector<Rooted<Node>> &path) const; protected: - void continueResolve(ResolutionState &state) override; + void doResolve(ResolutionState &state) override; /** * Adds a FieldDescriptor and checks for name uniqueness. @@ -695,7 +695,7 @@ private: NodeVector<Typesystem> typesystems; protected: - void continueResolve(ResolutionState &state) override; + void doResolve(ResolutionState &state) override; void addStructuredClass(Handle<StructuredClass> s); void addAnnotationClass(Handle<AnnotationClass> a); |