diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-25 15:50:52 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-25 15:50:52 +0100 |
| commit | eab6577b066319aab7ebaf514e6bb7aab9590624 (patch) | |
| tree | b93f21d4eb207b539e341aee6bba500b9aea8783 /test/core/model/DomainTest.cpp | |
| parent | 37a002577e7f4949e0634dca7e828b5333d2ccc5 (diff) | |
removed cardinality type definition from Domain.hpp and made everything compatible with the Variant cardinality.
Diffstat (limited to 'test/core/model/DomainTest.cpp')
| -rw-r--r-- | test/core/model/DomainTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/model/DomainTest.cpp b/test/core/model/DomainTest.cpp index c00b122..54fd86a 100644 --- a/test/core/model/DomainTest.cpp +++ b/test/core/model/DomainTest.cpp @@ -152,8 +152,8 @@ TEST(Descriptor, pathToAdvanced) Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)}; // Construct the domain Rooted<Domain> domain{new Domain(mgr, sys, "nasty")}; - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); // Let's create the classes that we need first Rooted<StructuredClass> A{new StructuredClass( @@ -225,8 +225,8 @@ TEST(StructuredClass, isSubclassOf) Manager mgr{1}; Rooted<SystemTypesystem> sys{new SystemTypesystem(mgr)}; Rooted<Domain> domain{new Domain(mgr, sys, "inheritance")}; - Cardinality any; - any.merge(Range<size_t>::typeRangeFrom(0)); + Variant::cardinalityType any; + any.merge(Range<size_t>::typeRange()); Rooted<StructuredClass> A{new StructuredClass( mgr, "A", domain, any, {nullptr}, {nullptr}, false, true)}; // first branch |