Commit after resolving conflicts

[satune.git] / src / AST / ops.h

diff --git a/src/AST/ops.h b/src/AST/ops.h
index adbef8dda52ede93bcce7c6ace8fdaca57eba28d..9fa296630bc46bc415cf1af1a7d9c437dd8f67a0 100644 (file)
--- a/src/AST/ops.h
+++ b/src/AST/ops.h
@@ -1,6 +1,6 @@
 #ifndef OPS_H
 #define OPS_H
-enum LogicOp {AND, OR, NOT, XOR, IMPLIES};
+enum LogicOp {L_AND, L_OR, L_NOT, L_XOR, L_IMPLIES};
 typedef enum LogicOp LogicOp;
 
 enum ArithOp {ADD, SUB};