edits

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index 2ee208d5fd7397995e5f39e452a9ec44825e7308..e01a778c419643cfa93495c87cd042694b941891 100644 (file)
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -14,7 +14,7 @@ Commit::Commit() :
        sequenceNumber(-1),
        machineId(-1),
        transactionSequenceNumber(-1),
-       liveKeys(new Hashset<IoTString *>) {
+       liveKeys(new Hashset<IoTString *>()) {
 }
 
 Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transactionSequenceNumber) :
@@ -28,7 +28,7 @@ Commit::Commit(int64_t _sequenceNumber, int64_t _machineId, int64_t _transaction
        sequenceNumber(_sequenceNumber),
        machineId(_machineId),
        transactionSequenceNumber(_transactionSequenceNumber),
-       liveKeys(new Hashset<IoTString *>) {
+       liveKeys(new Hashset<IoTString *>()) {
 }
 
 Commit::~Commit() {

diff --git a/version2/src/C/Slot.cc b/version2/src/C/Slot.cc
index 644854e56d6bdc145b5b7577ff7b647b18560f0a..6f37c9a52f519c7a2718e0444bfe91f2051b6100 100644 (file)
--- a/version2/src/C/Slot.cc
+++ b/version2/src/C/Slot.cc
@@ -17,8 +17,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_pre
        seqnumlive(true),
        freespace(SLOT_SIZE - getBaseSize()),
        table(_table),
-       localSequenceNumber(_localSequenceNumber),
-       fakeLastMessage(NULL) {
+       fakeLastMessage(NULL),
+       localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_prevhmac, int64_t _localSequenceNumber) :
@@ -31,8 +31,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, Array<char> *_pre
        seqnumlive(true),
        freespace(SLOT_SIZE - getBaseSize()),
        table(_table),
-       localSequenceNumber(_localSequenceNumber),
-       fakeLastMessage(NULL) {
+       fakeLastMessage(NULL),
+       localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSequenceNumber) :
@@ -45,8 +45,8 @@ Slot::Slot(Table *_table, int64_t _seqnum, int64_t _machineid, int64_t _localSeq
        seqnumlive(true),
        freespace(SLOT_SIZE - getBaseSize()),
        table(_table),
-       localSequenceNumber(_localSequenceNumber),
-       fakeLastMessage(NULL) {
+       fakeLastMessage(NULL),
+       localSequenceNumber(_localSequenceNumber) {
 }
 
 Slot::~Slot() {

diff --git a/version2/src/C/SlotBuffer.cc b/version2/src/C/SlotBuffer.cc
index af6b031ba36b911e6e24a359875ef32c3a0fc649..06c46e901d8f60a5970025476480c29da18d7e66 100644 (file)
--- a/version2/src/C/SlotBuffer.cc
+++ b/version2/src/C/SlotBuffer.cc
@@ -14,11 +14,11 @@ SlotBuffer::SlotBuffer() :
 }
 
 SlotBuffer::~SlotBuffer() {
-       uint index = tail;
+       int32_t index = tail;
        while (index != head) {
                delete array->get(index);
                index++;
-               if (index == array->length())
+               if (index == (int32_t) array->length())
                        index = 0;
        }
        delete array;
@@ -68,11 +68,11 @@ void SlotBuffer::putSlot(Slot *s) {
        int64_t checkNum = (getNewestSeqNum() + 1);
 
        if (checkNum != s->getSequenceNumber()) {
-               uint index = tail;
+               int32_t index = tail;
                while (index != head) {
                        delete array->get(index);
                        index++;
-                       if (index == array->length())
+                       if (index == (int32_t) array->length())
                                index = 0;
                }
                oldestseqn = s->getSequenceNumber();

diff --git a/version2/src/C/Test.C b/version2/src/C/Test.C
index dd3fc6216d3cd7794776fa200b8170fbb65b56c4..0f6c96cd6df7e406bd9735d9f931812db89de81f 100644 (file)
--- a/version2/src/C/Test.C
+++ b/version2/src/C/Test.C
@@ -177,6 +177,7 @@ int main(int numargs, char ** args) {
                        foundError = true;
                        printf("Status error\n");
                }
+               delete status;
        }
        
        if (foundError) {