Commit after resolving conflicts

[satune.git] / src / classlist.h

diff --git a/src/classlist.h b/src/classlist.h
index 14f43f80c57f857c7547a156fe796b3d30ab9054..3306ffe311b5e148e13824f9f5931109e7961704 100644 (file)
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -18,6 +18,9 @@
 
 struct CSolver;
 typedef struct CSolver CSolver;
 
 struct CSolver;
 typedef struct CSolver CSolver;

+struct SATEncoder;
+typedef struct SATEncoder SATEncoder;
+

 
 struct Constraint;
 typedef struct Constraint Constraint;
 
 struct Constraint;
 typedef struct Constraint Constraint;


@@ -36,7 +39,6 @@ typedef struct IncrementalSolver IncrementalSolver;
 
 struct Set;
 typedef struct Set Set;
 
 struct Set;
 typedef struct Set Set;

-

 typedef struct Set MutableSet;
 
 typedef struct ElementFunction ElementFunction;
 typedef struct Set MutableSet;
 
 typedef struct ElementFunction ElementFunction;


@@ -66,6 +68,9 @@ typedef struct ElementEncoding ElementEncoding;
 struct FunctionEncoding;
 typedef struct FunctionEncoding FunctionEncoding;
 
 struct FunctionEncoding;
 typedef struct FunctionEncoding FunctionEncoding;
 

+struct OrderEncoding;
+typedef struct OrderEncoding OrderEncoding;
+

 struct TableEntry;
 typedef struct TableEntry TableEntry;
 
 struct TableEntry;
 typedef struct TableEntry TableEntry;