edits

[iotcloud.git] / version2 / src / C / Transaction.cc

diff --git a/version2/src/C/Transaction.cc b/version2/src/C/Transaction.cc
index d9dbf916156bcff2c151c7f48da9160515470f93..1f862df5c42a46e392f0e4663737427baa7c60bd 100644 (file)
--- a/version2/src/C/Transaction.cc
+++ b/version2/src/C/Transaction.cc
@@ -102,7 +102,7 @@ int64_t Transaction::getSequenceNumber() {
 void Transaction::setSequenceNumber(int64_t _sequenceNumber) {
        sequenceNumber = _sequenceNumber;
 
-       for (int32_t i = 0; i < parts->size(); i++) {
+       for (uint32_t i = 0; i < parts->size(); i++) {
                TransactionPart *tp = parts->get(i);
                if (tp != NULL)
                        tp->setSequenceNumber(sequenceNumber);
@@ -205,8 +205,8 @@ bool Transaction::isComplete() {
        return fldisComplete;
 }
 
-Pair<int64_t, int64_t> * Transaction::getId() {
-       return & transactionId;
+Pair<int64_t, int64_t> *Transaction::getId() {
+       return &transactionId;
 }
 
 void Transaction::setDead() {
@@ -214,7 +214,7 @@ void Transaction::setDead() {
                // Set dead
                isDead = true;
                // Make all the parts of this transaction dead
-               for (int32_t partNumber = 0; partNumber < parts->size(); partNumber++) {
+               for (uint32_t partNumber = 0; partNumber < parts->size(); partNumber++) {
                        TransactionPart *part = parts->get(partNumber);
                        if (part != NULL)
                                part->setDead();
@@ -229,7 +229,7 @@ TransactionPart *Transaction::getPart(int index) {
 void Transaction::decodeTransactionData() {
        // Calculate the size of the data section
        int dataSize = 0;
-       for (int i = 0; i < parts->size(); i++) {
+       for (uint i = 0; i < parts->size(); i++) {
                TransactionPart *tp = parts->get(i);
                dataSize += tp->getDataSize();
        }
@@ -238,7 +238,7 @@ void Transaction::decodeTransactionData() {
        int currentPosition = 0;
 
        // Stitch all the data sections together
-       for (int i = 0; i < parts->size(); i++) {
+       for (uint i = 0; i < parts->size(); i++) {
                TransactionPart *tp = parts->get(i);
                System_arraycopy(tp->getData(), 0, combinedData, currentPosition, tp->getDataSize());
                currentPosition += tp->getDataSize();
@@ -264,7 +264,7 @@ void Transaction::decodeTransactionData() {
        }
 }
 
-bool Transaction::evaluateGuard(Hashtable<IoTString *, KeyValue *> *committedKeyValueTable, Hashtable<IoTString *, KeyValue *> *speculatedKeyValueTable, Hashtable<IoTString *, KeyValue *> *pendingTransactionSpeculatedKeyValueTable) {
+bool Transaction::evaluateGuard(Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals> *committedKeyValueTable, Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals> *speculatedKeyValueTable, Hashtable<IoTString *, KeyValue *, uintptr_t, 0, hashString, StringEquals> *pendingTransactionSpeculatedKeyValueTable) {
        SetIterator<KeyValue *, KeyValue *> *kvit = keyValueGuardSet->iterator();
        while (kvit->hasNext()) {
                KeyValue *kvGuard = kvit->next();