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.cpp | |
| parent | cd55519130c5f91d95107b3b1e1a8203caa5008a (diff) | |
| parent | 372c67e0844654362fc7d440b0b4a31500a6d02a (diff) | |
Merge branch 'master' of somweyr.de:ousia
Diffstat (limited to 'src/core/model/Domain.cpp')
| -rw-r--r-- | src/core/model/Domain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp index 17f3e02..9a0ed0d 100644 --- a/src/core/model/Domain.cpp +++ b/src/core/model/Domain.cpp @@ -70,7 +70,7 @@ FieldDescriptor::FieldDescriptor(Manager &mgr, Handle<Descriptor> parent, /* Class Descriptor */ -void Descriptor::continueResolve(ResolutionState &state) +void Descriptor::doResolve(ResolutionState &state) { if (attributesDescriptor != nullptr) { const NodeVector<Attribute> &attributes = @@ -254,7 +254,7 @@ AnnotationClass::AnnotationClass( /* Class Domain */ -void Domain::continueResolve(ResolutionState &state) +void Domain::doResolve(ResolutionState &state) { if (!continueResolveComposita(structuredClasses, structuredClasses.getIndex(), state) | |