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 58d37286193327f51491701a0f1a7bb2c15bdcdc..045323143c9402ba9533a42b9903efab38e8b60f 100644 (file)
--- a/src/Collections/structs.c
+++ b/src/Collections/structs.c
@@ -22,14 +22,12 @@ inline bool Ptr_equals(void * key1, void * key2) {
        return key1 == key2;
 }
 
-inline unsigned int order_pair_hash_Function(OrderPair* This){
-       uint64_t x=This->first^This->second;
-       uint64_t a=This->first&This->second;
-       return (uint)((x<<4)^(a));
+static inline unsigned int order_pair_hash_Function(OrderPair* This){
+       return (uint) (This->first << 2) ^ This->second;
 }
 
-inline unsigned int order_pair_equals(OrderPair* key1, OrderPair* key2){
+static inline unsigned int order_pair_equals(OrderPair* key1, OrderPair* key2){
        return key1->first== key2->first && key1->second == key2->second;
 }
 
-HashTableImpl(BoolConst, OrderPair *, Constraint *, order_pair_hash_Function, order_pair_equals);
+HashTableImpl(BoolConst, OrderPair *, OrderPair *, order_pair_hash_Function, order_pair_equals, ourfree);