commit after resolving conflicts

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index ac07af9e8066824cd5f866fb3db864a19efaffe1..f38b44bc5cbe3422c1951ffeecc8d44ff0ef9555 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -9,7 +9,7 @@
 
 #ifndef CLASSLIST_H
 #define CLASSLIST_H
-//#include "hashset.h"
+
 #include "mymemory.h"
 #include <inttypes.h>
 #define bool int
@@ -48,11 +48,21 @@ typedef struct Table Table;
 struct Order;
 typedef struct Order Order;
 
-struct ElementEncoder;
-typedef struct ElementEncoder ElementEncoder;
+struct ElementEncoding;
+typedef struct ElementEncoding ElementEncoding;
+
+struct FunctionEncoding;
+typedef struct FunctionEncoding FunctionEncoding;
+
+struct TableEntry;
+typedef struct TableEntry TableEntry;
+
 
-struct FunctionEncoder;
-typedef struct FunctionEncoder FunctionEncoder;
+typedef enum ArithOp ArithOp;
+typedef enum LogicOp LogicOp;
+typedef enum CompOp CompOp;
+typedef enum OrderType OrderType;
+typedef enum OverFlowBehavior OverFlowBehavior;
 
 typedef unsigned int uint;
 typedef uint64_t VarType;