X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.h;h=ba345c450bee95953e2ecb45d0322fd7f127004e;hp=35dce52400fc74daf1c71ae538e8affa700121f4;hb=5c33b56c3b97ca0381ac216a603c7553f4bea499;hpb=5f951824063db724807ea939ec10c75c3e4a1070

diff --git a/source/glsl/visitor.h b/source/glsl/visitor.h
index 35dce524..ba345c45 100644
--- a/source/glsl/visitor.h
+++ b/source/glsl/visitor.h
@@ -49,7 +49,6 @@ protected:
 	TraversingVisitor(): current_block(0) { }
 
 public:
-	using NodeVisitor::visit;
 	virtual void visit(Block &);
 	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(MemberAccess &);
@@ -75,10 +74,9 @@ private:
 	std::vector<T *> nodes;
 
 public:
-	const std::vector<T *> &apply(Stage &s) { nodes.clear(); visit(s.content); return nodes; }
+	const std::vector<T *> &apply(Stage &s) { s.content.visit(*this); return nodes; }
 
 private:
-	using TraversingVisitor::visit;
 	virtual void visit(T &n) { nodes.push_back(&n); }
 };
 
@@ -99,7 +97,6 @@ public:
 private:
 	void remove_variable(std::map<std::string, VariableDeclaration *> &, VariableDeclaration &);
 
-	using TraversingVisitor::visit;
 	virtual void visit(Block &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);