Fixing more bugs

[satune.git] / src / AST / order.h

diff --git a/src/AST/order.h b/src/AST/order.h
index b4abd07e20b88e2b222284ca8288ba51450d9b86..cc8b45e4adc7774e6b3510ef66fa80309a82ebbd 100644 (file)
--- a/src/AST/order.h
+++ b/src/AST/order.h
@@ -14,17 +14,17 @@ public:
        ~Order();
        OrderType type;
        Set *set;
-       HashTableOrderPair *orderPairTable;
-       HashSetOrderElement *elementTable;
+       HashtableOrderPair *orderPairTable;
        OrderGraph *graph;
-       Order * clone(CloneMap *map);
+       Order *clone(CSolver *solver, CloneMap *map);
        Vector<BooleanOrder *> constraints;
-       OrderEncoding order;
-       void initializeOrderHashTable();
-       void initializeOrderElementsHashTable();
+       OrderEncoding encoding;
+       void setOrderResolver(OrderResolver *_resolver) { ASSERT(encoding.resolver == NULL); encoding.resolver = _resolver;};
+       void initializeOrderHashtable();
+       void initializeOrderElementsHashtable();
        void addOrderConstraint(BooleanOrder *constraint);
        void setOrderEncodingType(OrderEncodingType type);
-       MEMALLOC;
+       CMEMALLOC;
 };
 
 #endif