Resolving Conflicts ... Still there're errors that should be fixed

[satune.git] / src / Encoders / functionencoding.h

diff --git a/src/Encoders/functionencoding.h b/src/Encoders/functionencoding.h
index dc52aa7f16f6b0330c17775ab905f62ac6b815ff..c7cf27e3c0743cf17b26225f614518195f00cd8f 100644 (file)
--- a/src/Encoders/functionencoding.h
+++ b/src/Encoders/functionencoding.h
@@ -3,7 +3,7 @@
 #include "classlist.h"
 
 enum FunctionEncodingType {
 #include "classlist.h"
 
 enum FunctionEncodingType {

-       ENUMERATEIMPLICATIONS, CIRCUIT
+       FUNC_UNASSIGNED, ENUMERATEIMPLICATIONS, CIRCUIT

 };
 
 typedef enum FunctionEncodingType FunctionEncodingType;
 };
 
 typedef enum FunctionEncodingType FunctionEncodingType;


@@ -21,8 +21,8 @@ struct FunctionEncoding {
        ElementPredicate op;
 };
 
        ElementPredicate op;
 };
 

-FunctionEncoding * allocFunctionEncoding(FunctionEncodingType type, Element *function);
-FunctionEncoding * allocPredicateEncoding(FunctionEncodingType type, Boolean *predicate);
+void initFunctionEncoding(FunctionEncoding *encoding, Element *function);
+void initPredicateEncoding(FunctionEncoding *encoding, Boolean *predicate);

 void deleteFunctionEncoding(FunctionEncoding *This);
 
 #endif
 void deleteFunctionEncoding(FunctionEncoding *This);
 
 #endif