X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FCommit.cc;h=f159f71608c59bf74f427234cab8af797fee8ddc;hp=ec4b39aefdf2885c275224e1ea66e8cb0c335734;hb=9c3fa5cbce287df14626d262bd0179e994338869;hpb=3e80b7cd423be3b7961a5f8d22bb6c274f1bc83a

diff --git a/version2/src/C/Commit.cc b/version2/src/C/Commit.cc
index ec4b39a..f159f71 100644
--- a/version2/src/C/Commit.cc
+++ b/version2/src/C/Commit.cc
@@ -198,7 +198,7 @@ void Commit::decodeCommitData() {
 Array<char> *Commit::convertDataToBytes() {
 	// Calculate the size of the data
 	int sizeOfData = sizeof(int32_t);	// Number of Update KV's
-	SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = keyValueUpdateSet->iterator();
+	SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = keyValueUpdateSet->iterator();
 	while (kvit->hasNext()) {
 		KeyValue *kv = kvit->next();
 		sizeOfData += kv->getSize();
@@ -227,7 +227,7 @@ void Commit::setKVsMap(Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKey
 	keyValueUpdateSet->clear();
 	keyValueUpdateSet->addAll(newKVs);
 	liveKeys->clear();
-	SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = newKVs->iterator();
+	SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = newKVs->iterator();
 	while (kvit->hasNext()) {
 		liveKeys->add(kvit->next()->getKey());
 	}
@@ -241,7 +241,7 @@ Commit *Commit_merge(Commit *newer, Commit *older, int64_t newSequenceNumber) {
 		return older;
 	}
 	Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvSet = new Hashset<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue>();
-	SetIterator<KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = older->getKeyValueUpdateSet()->iterator();
+	SetIterator<KeyValue *, KeyValue *, uintptr_t, 0, hashKeyValue, equalsKeyValue> *kvit = older->getKeyValueUpdateSet()->iterator();
 	while (kvit->hasNext()) {
 		KeyValue *kv = kvit->next();
 		kvSet->add(kv);