summaryrefslogtreecommitdiff
path: root/test/core/model/TestAdvanced.hpp
diff options
context:
space:
mode:
authorBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2015-01-25 15:50:52 +0100
committerBenjamin Paassen <bpaassen@techfak.uni-bielefeld.de>2015-01-25 15:50:52 +0100
commiteab6577b066319aab7ebaf514e6bb7aab9590624 (patch)
treeb93f21d4eb207b539e341aee6bba500b9aea8783 /test/core/model/TestAdvanced.hpp
parent37a002577e7f4949e0634dca7e828b5333d2ccc5 (diff)
removed cardinality type definition from Domain.hpp and made everything compatible with the Variant cardinality.
Diffstat (limited to 'test/core/model/TestAdvanced.hpp')
-rw-r--r--test/core/model/TestAdvanced.hpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp
index f8585d1..6f8ca33 100644
--- a/test/core/model/TestAdvanced.hpp
+++ b/test/core/model/TestAdvanced.hpp
@@ -53,7 +53,7 @@ static Rooted<Domain> constructHeadingDomain(Manager &mgr,
// set up domain node.
Rooted<Domain> domain{new Domain(mgr, sys, "headings")};
// set up cardinality (every section may have at most one heading).
- Cardinality card;
+ Variant::cardinalityType card;
card.merge({0, 1});
// set up heading StructuredClass.
Rooted<StructuredClass> heading{new StructuredClass(
@@ -84,8 +84,8 @@ static Rooted<Domain> constructListDomain(Manager &mgr,
// set up domain node.
Rooted<Domain> domain{new Domain(mgr, sys, "list")};
// set up cardinality
- Cardinality any;
- any.merge(Range<size_t>::typeRangeFrom(0));
+ Variant::cardinalityType any;
+ any.merge(Range<size_t>::typeRange());
// get book.paragraph
Rooted<StructuredClass> p = resolveDescriptor(bookDomain, "paragraph");
// set up item StructuredClass;