From 1da7b31f13b00fdf4e572b5847750237f484b505 Mon Sep 17 00:00:00 2001
From: Andreas Stöckel <astoecke@techfak.uni-bielefeld.de>
Date: Fri, 21 Nov 2014 12:27:34 +0100
Subject: resolve now resolves lists of generic Managed objects and not nodes
 (this is needed as e.g. constants need to be resolved, which are
 TypeInstances but not Nodes)

---
 src/core/Node.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/core/Node.cpp')

diff --git a/src/core/Node.cpp b/src/core/Node.cpp
index c18adb4..607c607 100644
--- a/src/core/Node.cpp
+++ b/src/core/Node.cpp
@@ -47,14 +47,14 @@ std::vector<std::string> Node::path() const
 	return res;
 }
 
-void Node::doResolve(std::vector<Rooted<Node>> &res,
+void Node::doResolve(std::vector<Rooted<Managed>> &res,
                      const std::vector<std::string> &path, Filter filter,
                      void *filterData, unsigned idx, VisitorSet &visited)
 {
 	// Do nothing in the default implementation
 }
 
-int Node::resolve(std::vector<Rooted<Node>> &res,
+int Node::resolve(std::vector<Rooted<Managed>> &res,
                   const std::vector<std::string> &path, Filter filter,
                   void *filterData, unsigned idx, VisitorSet &visited,
                   const std::string *alias)
@@ -87,11 +87,11 @@ int Node::resolve(std::vector<Rooted<Node>> &res,
 	return res.size();
 }
 
-std::vector<Rooted<Node>> Node::resolve(const std::vector<std::string> &path,
+std::vector<Rooted<Managed>> Node::resolve(const std::vector<std::string> &path,
                                         Filter filter = nullptr,
                                         void *filterData = nullptr)
 {
-	std::vector<Rooted<Node>> res;
+	std::vector<Rooted<Managed>> res;
 	VisitorSet visited;
 	resolve(res, path, filter, filterData, 0, visited, nullptr);
 	return res;
-- 
cgit v1.2.3