Merging with branch master

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

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