diff options
Diffstat (limited to 'test/core')
| -rw-r--r-- | test/core/common/RttiTest.cpp | 8 | ||||
| -rw-r--r-- | test/core/model/DomainTest.cpp | 2 | ||||
| -rw-r--r-- | test/core/model/TestDocumentBuilder.hpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/core/common/RttiTest.cpp b/test/core/common/RttiTest.cpp index e5d7571..36bf48f 100644 --- a/test/core/common/RttiTest.cpp +++ b/test/core/common/RttiTest.cpp @@ -50,13 +50,13 @@ const Rtti<RttiTestClass2> Type2("Type2"); const Rtti<RttiTestClass3> Type3("Type3", {&Type1}); const Rtti<RttiTestClass4> Type4("Type4", {&Type3, &Type2}); const Rtti<RttiTestClass5> Type5("Type5", - std::unordered_set<const RttiBase *>{}, + std::unordered_set<const RttiType *>{}, {&Type6, &Type7}); const Rtti<RttiTestClass6> Type6("Type6", - std::unordered_set<const RttiBase *>{}, + std::unordered_set<const RttiType *>{}, {&Type1}); const Rtti<RttiTestClass7> Type7("Type7", {&Type6}, - std::unordered_set<const RttiBase *>{}); + std::unordered_set<const RttiType *>{}); TEST(Rtti, isa) { @@ -83,7 +83,7 @@ TEST(Rtti, isa) TEST(Rtti, composedOf) { - std::vector<const RttiBase *> types{&Type1, &Type2, &Type3, &Type4}; + std::vector<const RttiType *> types{&Type1, &Type2, &Type3, &Type4}; for (auto t : types) { ASSERT_FALSE(t->composedOf(Type1)); ASSERT_FALSE(t->composedOf(Type2)); diff --git a/test/core/model/DomainTest.cpp b/test/core/model/DomainTest.cpp index 9cd5bec..317223d 100644 --- a/test/core/model/DomainTest.cpp +++ b/test/core/model/DomainTest.cpp @@ -28,7 +28,7 @@ namespace ousia { namespace model { -void assert_path(const ResolutionResult &res, const RttiBase &expected_type, +void assert_path(const ResolutionResult &res, const RttiType &expected_type, std::vector<std::string> expected_path) { // Check class/type diff --git a/test/core/model/TestDocumentBuilder.hpp b/test/core/model/TestDocumentBuilder.hpp index 0c6ca34..ed7a0ee 100644 --- a/test/core/model/TestDocumentBuilder.hpp +++ b/test/core/model/TestDocumentBuilder.hpp @@ -46,7 +46,7 @@ static std::string getPathString(const Path &path) static Rooted<Descriptor> resolveDescriptor(Handle<Document> doc, Logger &logger, const Path &path, - const RttiBase &type) + const RttiType &type) { // use the actual resolve method. std::vector<ResolutionResult> resolved = doc->resolve(path, type); |