Compiles

[iotcloud.git] / version2 / src / C / TransactionPart.h

diff --git a/version2/src/C/TransactionPart.h b/version2/src/C/TransactionPart.h
index d00a01ae5bac4056e882d53880f41d4d714ae0bf..c8aa649d685be8e42ae4afc1092a89b1567f3c8e 100644 (file)
--- a/version2/src/C/TransactionPart.h
+++ b/version2/src/C/TransactionPart.h
@@ -2,23 +2,24 @@
 #define TRANSACTIONPART_H
 #include "common.h"
 #include "Entry.h"
+#include "Pair.h"
 
 // Max size of the part excluding the fixed size header
 #define TransactionPart_MAX_NON_HEADER_SIZE 512
 
 class TransactionPart : public Entry {
 private:
-       int64_t sequenceNumber = -1;
-       int64_t machineId = -1;
-       int64_t arbitratorId = -1;
-       int64_t clientLocalSequenceNumber = -1;         // Sequence number of the transaction that this is a part of
-       int partNumber = -1;    // Parts position in the
-       bool isLastPart = false;
+       int64_t sequenceNumber;
+       int64_t machineId;
+       int64_t arbitratorId;
+       int64_t clientLocalSequenceNumber;              // Sequence number of the transaction that this is a part of
+       int32_t partNumber;     // Parts position in the
+       bool fldisLastPart;
 
-       Pair<int64_t, int64_t> *transactionId = NULL;
-       Pair<int64_t int32_t> *partId = NULL;
+       Pair<int64_t, int64_t> transactionId;
+       Pair<int64_t, int32_t> partId;
 
-       Array<char> *data = NULL;
+       Array<char> *data;
 
 public:
        TransactionPart(Slot *s, int64_t _machineId, int64_t _arbitratorId, int64_t _clientLocalSequenceNumber, int _partNumber, Array<char> *_data, bool _isLastPart) : Entry(s),
@@ -27,17 +28,16 @@ public:
                arbitratorId(_arbitratorId),
                clientLocalSequenceNumber(_clientLocalSequenceNumber),
                partNumber(_partNumber),
-               isLastPart(_isLastPart)
-               transactionId(new Pair<int64_t, int64_t>(machineId, clientLocalSequenceNumber)),
-               partId(new Pair<int64_t int32_t>(clientLocalSequenceNumber, partNumber)),
+               fldisLastPart(_isLastPart),
+               transactionId(Pair<int64_t, int64_t>(machineId, clientLocalSequenceNumber)),
+               partId(Pair<int64_t, int32_t>(clientLocalSequenceNumber, partNumber)),
                data(_data) {
        }
 
        int getSize();
-       void setSlot(Slot s);
-       Pair<int64_t, int64_t> *getTransactionId();
+       Pair<int64_t, int64_t> getTransactionId();
        int64_t getArbitratorId();
-       Pair<int64_t int32_t> *getPartId();
+       Pair<int64_t, int32_t> getPartId();
        int getPartNumber();
        int getDataSize();
        Array<char> *getData();