X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=version2%2Fsrc%2FC%2FTransaction.h;h=2f0e3dde4623ca82846be88a42c80e9a4318bff3;hb=a578eebaebcddd7f6b2a1b2edeed739bef657d5a;hp=aa62661ecfbcb07ac11ca679d78529de63f8c0dd;hpb=7262ffd03fa5a5f9e92977e7e3cc04dd2c2ff6e0;p=iotcloud.git

diff --git a/version2/src/C/Transaction.h b/version2/src/C/Transaction.h
index aa62661..2f0e3dd 100644
--- a/version2/src/C/Transaction.h
+++ b/version2/src/C/Transaction.h
@@ -1,26 +1,27 @@
 #ifndef TRANSACTION_H
 #define TRANSACTION_H
 #include "common.h"
+#include "Pair.h"
 
 class Transaction {
 private:
-	Hashtable<int32_t, TransactionPart *> *parts = NULL;
-	Hashset<int32_t> *missingParts = NULL;
-	Vector<int32_t> *partsPendingSend = NULL;
-	bool isComplete = false;
-	bool hasLastPart = false;
-	Hashset<KeyValue *> *keyValueGuardSet = NULL;
-	Hashset<KeyValue *> *keyValueUpdateSet = NULL;
-	bool isDead = false;
-	int64_t sequenceNumber = -1;
-	int64_t clientLocalSequenceNumber = -1;
-	int64_t arbitratorId = -1;
-	int64_t machineId = -1;
-	Pair<uint64_t, uint64_t> *transactionId = NULL;
-	int nextPartToSend = 0;
-	bool didSendAPartToServer = false;
-	TransactionStatus *transactionStatus = NULL;
-	bool hadServerFailure = false;
+	Hashtable<int32_t, TransactionPart *> *parts;
+	Hashset<int32_t> *missingParts;
+	Vector<int32_t> *partsPendingSend;
+	bool fldisComplete;
+	bool hasLastPart;
+	Hashset<KeyValue *> *keyValueGuardSet;
+	Hashset<KeyValue *> *keyValueUpdateSet;
+	bool isDead;
+	int64_t sequenceNumber;
+	int64_t clientLocalSequenceNumber;
+	int64_t arbitratorId;
+	int64_t machineId;
+	Pair<uint64_t, uint64_t> *transactionId;
+	int nextPartToSend;
+	bool flddidSendAPartToServer;
+	TransactionStatus *transactionStatus;
+	bool hadServerFailure;
 	void decodeTransactionData();
 
 public: