Merging with branch master

[satune.git] / src / Encoders / orderencoding.h

diff --git a/src/Encoders/orderencoding.h b/src/Encoders/orderencoding.h
index 57409e733514a52780de1c32c26b08229a65267a..4b0915a92fe18f74551f2ec46d7ee66c032cd831 100644 (file)
--- a/src/Encoders/orderencoding.h
+++ b/src/Encoders/orderencoding.h
@@ -11,10 +11,11 @@ typedef enum OrderEncodingType OrderEncodingType;
 class OrderEncoding {
 public:
        OrderEncoding(Order *order);
-
+       virtual ~OrderEncoding();
+       OrderResolver *resolver;
        OrderEncodingType type;
        Order *order;
-       MEMALLOC;
+       CMEMALLOC;
 };
 
 #endif