X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=8bfcac0fd490b85bb2db1c32dfca371a4e786363;hb=ff8a0248f1a3c0c1f48f670867bc9106c898c55b;hp=e1c45b5c89de152976cfd94549c018f8e7607116;hpb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index e1c45b5c..8bfcac0f 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -83,29 +83,31 @@ public:
 };
 
 template<typename T>
-class NodeGatherer: public TraversingVisitor
+class NodeGatherer: private TraversingVisitor
 {
 private:
 	std::vector<T *> nodes;
 
 public:
-	const std::vector<T *> &apply(Stage &s) { visit(s.content); return nodes; }
+	const std::vector<T *> &apply(Stage &s) { nodes.clear(); visit(s.content); return nodes; }
 
+private:
 	using TraversingVisitor::visit;
 	virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
-class NodeRemover: public TraversingVisitor
+class NodeRemover: private TraversingVisitor
 {
 private:
 	Stage *stage;
-	std::set<Node *> to_remove;
+	const std::set<Node *> *to_remove;
 
 public:
-	NodeRemover(const std::set<Node *> &);
+	NodeRemover();
 
-	void apply(Stage &);
+	void apply(Stage &, const std::set<Node *> &);
 
+private:
 	using TraversingVisitor::visit;
 	virtual void visit(Block &);
 	virtual void visit(VariableDeclaration &);