From dc93436da9b4c1d4b81375ba3a013b120d661caa Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Thu, 14 Nov 2013 21:17:41 -0500
Subject: [PATCH] Compile fixes

---
 tests/CSGTextRenderer.cc | 32 ++++++++++----------------------
 tests/CSGTextRenderer.h  |  6 +++---
 2 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/tests/CSGTextRenderer.cc b/tests/CSGTextRenderer.cc
index d254820f..9bd066e3 100644
--- a/tests/CSGTextRenderer.cc
+++ b/tests/CSGTextRenderer.cc
@@ -24,29 +24,29 @@ bool CSGTextRenderer::isCached(const AbstractNode &node)
 	target = target [op] src
  */
 void
-CSGTextRenderer::process(string &target, const string &src, CSGTextRenderer::CsgOp op)
+CSGTextRenderer::process(string &target, const string &src, OpenSCADOperator op)
 {
 // 	if (target.dim != 2 && target.dim != 3) {
 // 		assert(false && "Dimension of Nef polyhedron must be 2 or 3");
 // 	}
 
 	switch (op) {
-	case UNION:
+	case OPENSCAD_UNION:
 		target += "+" + src;
 		break;
-	case INTERSECTION:
+	case OPENSCAD_INTERSECTION:
 		target += "*" + src;
 		break;
-	case DIFFERENCE:
+	case OPENSCAD_DIFFERENCE:
 		target += "-" + src;
 		break;
-	case MINKOWSKI:
+	case OPENSCAD_MINKOWSKI:
 		target += "M" + src;
 		break;
 	}
 }
 
-void CSGTextRenderer::applyToChildren(const AbstractNode &node, CSGTextRenderer::CsgOp op)
+void CSGTextRenderer::applyToChildren(const AbstractNode &node, OpenSCADOperator op)
 {
 	std::stringstream stream;
 	stream << node.name() << node.index();
@@ -86,7 +86,7 @@ Response CSGTextRenderer::visit(State &state, const AbstractNode &node)
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
-		if (!isCached(node)) applyToChildren(node, UNION);
+		if (!isCached(node)) applyToChildren(node, OPENSCAD_UNION);
 		addToParent(state, node);
 	}
 	return ContinueTraversal;
@@ -96,7 +96,7 @@ Response CSGTextRenderer::visit(State &state, const AbstractIntersectionNode &no
 {
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
-		if (!isCached(node)) applyToChildren(node, INTERSECTION);
+		if (!isCached(node)) applyToChildren(node, OPENSCAD_INTERSECTION);
 		addToParent(state, node);
 	}
 	return ContinueTraversal;
@@ -107,19 +107,7 @@ Response CSGTextRenderer::visit(State &state, const CsgNode &node)
 	if (state.isPrefix() && isCached(node)) return PruneTraversal;
 	if (state.isPostfix()) {
 		if (!isCached(node)) {
-			CsgOp op;
-			switch (node.type) {
-			case CSG_TYPE_UNION:
-				op = UNION;
-				break;
-			case CSG_TYPE_DIFFERENCE:
-				op = DIFFERENCE;
-				break;
-			case CSG_TYPE_INTERSECTION:
-				op = INTERSECTION;
-				break;
-			}
-			applyToChildren(node, op);
+			applyToChildren(node, node.type);
 		}
 		addToParent(state, node);
 	}
@@ -132,7 +120,7 @@ Response CSGTextRenderer::visit(State &state, const TransformNode &node)
 	if (state.isPostfix()) {
 		if (!isCached(node)) {
 			// First union all children
-			applyToChildren(node, UNION);
+			applyToChildren(node, OPENSCAD_UNION);
 			// FIXME: Then apply transform
 		}
 		addToParent(state, node);
diff --git a/tests/CSGTextRenderer.h b/tests/CSGTextRenderer.h
index 79a8a96f..f3074b58 100644
--- a/tests/CSGTextRenderer.h
+++ b/tests/CSGTextRenderer.h
@@ -3,6 +3,7 @@
 
 #include "visitor.h"
 #include "CSGTextCache.h"
+#include "enums.h"
 
 #include <map>
 #include <list>
@@ -24,11 +25,10 @@ public:
 	virtual Response visit(State &state, const AbstractPolyNode &node);
 
 private:
-	enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI};
   void addToParent(const State &state, const AbstractNode &node);
   bool isCached(const AbstractNode &node);
-	void process(string &target, const string &src, CSGTextRenderer::CsgOp op);
-	void applyToChildren(const AbstractNode &node, CSGTextRenderer::CsgOp op);
+	void process(string &target, const string &src, OpenSCADOperator op);
+	void applyToChildren(const AbstractNode &node, OpenSCADOperator op);
 
   string currindent;
   typedef list<const AbstractNode *> ChildList;