summaryrefslogtreecommitdiff
path: root/src/CSGTermEvaluator.h
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2011-08-27 20:09:48 (GMT)
committerMarius Kintel <marius@kintel.net>2011-08-27 20:09:48 (GMT)
commitb68537b6ac032cb138e4c6225c6be8680f9664f7 (patch)
tree0dc5fdb7c61db01704a69ef3e4c0519f0be86089 /src/CSGTermEvaluator.h
parentb3dd77d2521fae2305251a57217b1b22fe7180e0 (diff)
parentec85e65ee983258db44770f246537562a16d141b (diff)
Merge pull request #20 from donbright/visitorwinxp
fix build errors on windows
Diffstat (limited to 'src/CSGTermEvaluator.h')
-rw-r--r--src/CSGTermEvaluator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CSGTermEvaluator.h b/src/CSGTermEvaluator.h
index beb1201..ff62cc1 100644
--- a/src/CSGTermEvaluator.h
+++ b/src/CSGTermEvaluator.h
@@ -34,7 +34,7 @@ public:
vector<CSGTerm*> &background);
private:
- enum CsgOp {UNION, INTERSECTION, DIFFERENCE, MINKOWSKI};
+ enum CsgOp {CSGT_UNION, CSGT_INTERSECTION, CSGT_DIFFERENCE, CSGT_MINKOWSKI};
void addToParent(const State &state, const AbstractNode &node);
void applyToChildren(const AbstractNode &node, CSGTermEvaluator::CsgOp op);
contact: Jan Huwald // Impressum