From b05499223916879e051d102e1b7e2fd080f46e7d Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Thu, 8 Jan 2015 20:31:30 +0100
Subject: further extended advanced document (now list domain is supported as
 well) and extended DemoOutput accordingly.

---
 src/core/model/Domain.cpp | 20 ++++++++++----------
 src/core/model/Domain.hpp |  6 ------
 2 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'src/core')

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?
-- 
cgit v1.2.3