diff options
| author | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-08 20:31:30 +0100 |
|---|---|---|
| committer | Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de> | 2015-01-08 20:31:30 +0100 |
| commit | b05499223916879e051d102e1b7e2fd080f46e7d (patch) | |
| tree | f4cade370ee065ed4303ecb71cd47a20ce93c22e /src/core/model | |
| parent | 2c3b327739b79d5ba7fe931e205bec1ad320b360 (diff) | |
further extended advanced document (now list domain is supported as well) and extended DemoOutput accordingly.
Diffstat (limited to 'src/core/model')
| -rw-r--r-- | src/core/model/Domain.cpp | 20 | ||||
| -rw-r--r-- | src/core/model/Domain.hpp | 6 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/core/model/Domain.cpp b/src/core/model/Domain.cpp index f9e2a55..49a3200 100644 --- a/src/core/model/Domain.cpp +++ b/src/core/model/Domain.cpp @@ -53,16 +53,16 @@ void Descriptor::doResolve(std::vector<Rooted<Managed>> &res, // &DESCRIPTOR_ATTRIBUTES_ALIAS); } -void StructuredClass::doResolve(std::vector<Rooted<Managed>> &res, - const std::vector<std::string> &path, - Filter filter, void *filterData, unsigned idx, - VisitorSet &visited) -{ - Descriptor::doResolve(res, path, filter, filterData, idx, visited); - if (!isa.isNull()) { - isa->doResolve(res, path, filter, filterData, idx, visited); - } -} +//void StructuredClass::doResolve(std::vector<Rooted<Managed>> &res, +// const std::vector<std::string> &path, +// Filter filter, void *filterData, unsigned idx, +// VisitorSet &visited) +//{ +// Descriptor::doResolve(res, path, filter, filterData, idx, visited); +// if (!isa.isNull()) { +// isa->doResolve(res, path, filter, filterData, idx, visited); +// } +//} void Domain::doResolve(std::vector<Rooted<Managed>> &res, const std::vector<std::string> &path, Filter filter, diff --git a/src/core/model/Domain.hpp b/src/core/model/Domain.hpp index 8d5de0c..6a07b32 100644 --- a/src/core/model/Domain.hpp +++ b/src/core/model/Domain.hpp @@ -468,12 +468,6 @@ private: Owned<StructuredClass> isa; NodeVector<FieldDescriptor> parents; -protected: - void doResolve(std::vector<Rooted<Managed>> &res, - const std::vector<std::string> &path, Filter filter, - void *filterData, unsigned idx, - VisitorSet &visited) override; - public: const bool transparent; // TODO: Is it possible to have root=true and cardinality other than 1? |