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

[satune.git] / src / Collections / structs.h

diff --git a/src/Collections/structs.h b/src/Collections/structs.h
index fec9d75cc539b3e256fc34781266a8183ddbfead..dc6d66573c4f3c10bd355136dc493dab327941ca 100644 (file)
--- a/src/Collections/structs.h
+++ b/src/Collections/structs.h
@@ -10,6 +10,7 @@ ArrayDef(Element, Element *);
 ArrayDef(Boolean, Boolean *);
 ArrayDef(Set, Set *);
 
 ArrayDef(Boolean, Boolean *);
 ArrayDef(Set, Set *);
 

+

 VectorDef(Table, Table *, 4);
 VectorDef(Set, Set *, 4);
 VectorDef(Boolean, Boolean *, 4);
 VectorDef(Table, Table *, 4);
 VectorDef(Set, Set *, 4);
 VectorDef(Boolean, Boolean *, 4);


@@ -20,6 +21,8 @@ VectorDef(Element, Element *, 4);
 VectorDef(Order, Order *, 4);
 VectorDef(TableEntry, TableEntry *, 4);
 VectorDef(ASTNode, ASTNode *, 4);
 VectorDef(Order, Order *, 4);
 VectorDef(TableEntry, TableEntry *, 4);
 VectorDef(ASTNode, ASTNode *, 4);

+VectorDef(FunctionEncoding, FunctionEncoding *, 4);
+VectorDef(ElementEncoding, ElementEncoding *, 4);

 VectorDef(Int, uint64_t, 4);
 
 
 VectorDef(Int, uint64_t, 4);
 
 


@@ -31,5 +34,11 @@ inline bool Ptr_equals(void * key1, void * key2) {
        return key1 == key2;
 }
 
        return key1 == key2;
 }
 

+HashTableDef(Void, void *, void *, Ptr_hash_function, Ptr_equals);
+HashTableDef(ElemToEncod, Element *, ElementEncoding *, Ptr_hash_function, Ptr_equals);
+HashTableDef(VoidToFuncEncod, void *, FunctionEncoding *, Ptr_hash_function, Ptr_equals);
+
+HashSetDef(Void, void *, Ptr_hash_function, Ptr_equals);
+

 
 #endif
 
 #endif