diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-16 11:57:08 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-02-16 11:57:08 +0100 |
| commit | 3cca090a650d2e8268977b57aa0dfdb0fb2cae85 (patch) | |
| tree | 761eba26c204dfdf6b1d34eee345bc18a0fd13db /test/core/model/TestDomain.hpp | |
| parent | 884c7d772da6ad9869866f8a7a15bd08a15376ba (diff) | |
added return value in addFieldDescriptor related methods to indicate whether the order of fields had to be changed.
Diffstat (limited to 'test/core/model/TestDomain.hpp')
| -rw-r--r-- | test/core/model/TestDomain.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/test/core/model/TestDomain.hpp b/test/core/model/TestDomain.hpp index c107a0d..779ef03 100644 --- a/test/core/model/TestDomain.hpp +++ b/test/core/model/TestDomain.hpp @@ -42,7 +42,8 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, mgr, "book", domain, single, {nullptr}, false, true)}; // The structure field of it. - Rooted<FieldDescriptor> book_field = book->createFieldDescriptor(logger); + Rooted<FieldDescriptor> book_field = + book->createFieldDescriptor(logger).first; // From there on the "section". Rooted<StructuredClass> section{ @@ -51,7 +52,7 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, // And the field of it. Rooted<FieldDescriptor> section_field = - section->createFieldDescriptor(logger); + section->createFieldDescriptor(logger).first; // We also add the "paragraph", which is transparent. Rooted<StructuredClass> paragraph{new StructuredClass( @@ -61,7 +62,7 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, // And the field of it. Rooted<FieldDescriptor> paragraph_field = - paragraph->createFieldDescriptor(logger); + paragraph->createFieldDescriptor(logger).first; // We append "subsection" to section. Rooted<StructuredClass> subsection{ @@ -70,7 +71,7 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, // And the field of it. Rooted<FieldDescriptor> subsection_field = - subsection->createFieldDescriptor(logger); + subsection->createFieldDescriptor(logger).first; // and we add the paragraph to subsections fields subsection_field->addChild(paragraph); @@ -82,10 +83,11 @@ static Rooted<Domain> constructBookDomain(Manager &mgr, // ... and has a primitive field. Rooted<FieldDescriptor> text_field = - text->createPrimitiveFieldDescriptor(sys->getStringType(), logger); + text->createPrimitiveFieldDescriptor(sys->getStringType(), logger) + .first; return domain; } } -#endif /* _TEST_DOMAIN_HPP_ */ +#endif /* _TEST_DOMAIN_HPP_ */
\ No newline at end of file |