X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FCommitPart.cc;h=d137a75e1611b1e36cc02700f8baa14061355b95;hp=08cd46bf5bb1b787d049f053a173bac4ec6fc931;hb=fc3e0b967949a83c40622b339a115900c07fd253;hpb=bee76cd147ce3f14198f601123154500da5e4f1a

diff --git a/version2/src/C/CommitPart.cc b/version2/src/C/CommitPart.cc
index 08cd46b..d137a75 100644
--- a/version2/src/C/CommitPart.cc
+++ b/version2/src/C/CommitPart.cc
@@ -1,5 +1,5 @@
 #include "CommitPart.h"
-
+#include "ByteBuffer.h"
 
 CommitPart::CommitPart(Slot *s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, Array<char> *_data, bool _isLastPart) :
 	Entry(s),
@@ -9,7 +9,7 @@ CommitPart::CommitPart(Slot *s, int64_t _machineId, int64_t _sequenceNumber, int
 	partNumber(_partNumber),
 	fldisLastPart(_isLastPart),
 	data(_data),
-	partId(new Pair<int64_t int32_t>(sequenceNumber, partNumber)),
+	partId(new Pair<int64_t, int32_t>(sequenceNumber, partNumber)),
 	commitId(new Pair<int64_t, int64_t>(machineId, sequenceNumber)) {
 }
 
@@ -20,7 +20,7 @@ int CommitPart::getSize() {
 	return (3 * sizeof(int64_t)) + (2 * sizeof(int32_t)) + (2 * sizeof(char)) + data->length();
 }
 
-void CommitPart::setSlot(Slot s) {
+void CommitPart::setSlot(Slot* s) {
 	parentslot = s;
 }
 
@@ -36,7 +36,7 @@ Array<char> *CommitPart::getData() {
 	return data;
 }
 
-Pair<int64_t int32_t> *CommitPart::getPartId() {
+Pair<int64_t, int32_t> *CommitPart::getPartId() {
 	return partId;
 }
 
@@ -75,13 +75,13 @@ Entry *CommitPart_decode(Slot *s, ByteBuffer *bb) {
 	return new CommitPart(s, machineId, sequenceNumber, transactionSequenceNumber, partNumber, data, isLastPart);
 }
 
-void CommitPart::encode(ByteBuffer bb) {
+void CommitPart::encode(ByteBuffer *bb) {
 	bb->put(TypeCommitPart);
 	bb->putLong(machineId);
 	bb->putLong(sequenceNumber);
 	bb->putLong(transactionSequenceNumber);
 	bb->putInt(partNumber);
-	bb->putInt(data.length);
+	bb->putInt(data->length());
 
 	if (fldisLastPart) {
 		bb->put((char)1);