Commit after resolving conflicts

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index d232592fef332c3d58cbe6670569f3e03ce0cfe0..3306ffe311b5e148e13824f9f5931109e7961704 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -18,6 +18,9 @@
 
 struct CSolver;
 typedef struct CSolver CSolver;
+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
+
 
 struct Constraint;
 typedef struct Constraint Constraint;
@@ -26,6 +29,7 @@ typedef struct BooleanOrder BooleanOrder;
 typedef struct BooleanVar BooleanVar;
 typedef struct BooleanLogic BooleanLogic;
 typedef struct BooleanComp BooleanComp;
+typedef struct BooleanPredicate BooleanPredicate;
 
 struct Boolean;
 typedef struct Boolean Boolean;
@@ -35,12 +39,17 @@ typedef struct IncrementalSolver IncrementalSolver;
 
 struct Set;
 typedef struct Set Set;
-
 typedef struct Set MutableSet;
 
+typedef struct ElementFunction ElementFunction;
+typedef struct ElementSet ElementSet;
+
 struct Element;
 typedef struct Element Element;
 
+typedef struct FunctionOperator FunctionOperator;
+typedef struct FunctionTable FunctionTable;
+
 struct Function;
 typedef struct Function Function;
 
@@ -59,6 +68,9 @@ typedef struct ElementEncoding ElementEncoding;
 struct FunctionEncoding;
 typedef struct FunctionEncoding FunctionEncoding;
 
+struct OrderEncoding;
+typedef struct OrderEncoding OrderEncoding;
+
 struct TableEntry;
 typedef struct TableEntry TableEntry;