Fix some of the memory leaks

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

diff --git a/src/Collections/structs.c b/src/Collections/structs.c
index 6fd7ceaa804e63c973074be135d796c36a75b184..045323143c9402ba9533a42b9903efab38e8b60f 100644 (file)
--- a/src/Collections/structs.c
+++ b/src/Collections/structs.c
@@ -1,6 +1,6 @@
 #include "structs.h"
 #include "mymemory.h"
-#include "order.h"
+#include "orderpair.h"
 
 VectorImpl(Table, Table *, 4);
 VectorImpl(Set, Set *, 4);
@@ -22,12 +22,12 @@ inline bool Ptr_equals(void * key1, void * key2) {
        return key1 == key2;
 }
 
-inline unsigned int BooleanOrder_hash_Function(BooleanOrder* This){
-       return This->first ^ This->second;
+static inline unsigned int order_pair_hash_Function(OrderPair* This){
+       return (uint) (This->first << 2) ^ This->second;
 }
 
-inline unsigned int BooleanOrder_equals(BooleanOrder* key1, BooleanOrder* key2){
+static inline unsigned int order_pair_equals(OrderPair* key1, OrderPair* key2){
        return key1->first== key2->first && key1->second == key2->second;
 }
 
-HashTableImpl(BoolConst, BooleanOrder *, Constraint *, BooleanOrder_hash_Function, BooleanOrder_equals);
+HashTableImpl(BoolConst, OrderPair *, OrderPair *, order_pair_hash_Function, order_pair_equals, ourfree);