Merging with branch Master

[satune.git] / src / Backend / orderelement.h

diff --git a/src/Backend/orderelement.h b/src/Backend/orderelement.h
index 6bdcbc6482a7e2c164ed8bfe4b608cd7f8f7824f..07913c9aa4fd5a85be0fbe2d2d99d0abec752c43 100644 (file)
--- a/src/Backend/orderelement.h
+++ b/src/Backend/orderelement.h
@@ -12,13 +12,18 @@
 #include "mymemory.h"
 #include "constraint.h"
 
-struct OrderElement {
+class OrderElement {
+public:
+       OrderElement(uint64_t item, Element *elem);
+       inline uint getHash() {return (uint) item;}
+       inline bool equals(OrderElement* oe){ return item == oe->item;}
+       inline Element* getElement() { return elem; }
+       CMEMALLOC;
+private:
        uint64_t item;
-       Element* elem;
+       Element *elem;
 };
 
-OrderElement *allocOrderElement(uint64_t item, Element* elem);
-void deleteOrderElement(OrderElement *pair);
 
 #endif/* ORDERELEMENT_H */