X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iotcloud.git;a=blobdiff_plain;f=version2%2Fsrc%2FC%2FCommitPart.cc;h=4de55c925879d0c1d52f2025149eb34aa062a620;hp=32ddd6175d719bf07c03cc6ae91a37393a46bcde;hb=41ff9c95ca5d4b707386c1b7e66df033169bf68d;hpb=f0a95f7a96e808259ced5e9f61e029773c7a85e6

diff --git a/version2/src/C/CommitPart.cc b/version2/src/C/CommitPart.cc
index 32ddd61..4de55c9 100644
--- a/version2/src/C/CommitPart.cc
+++ b/version2/src/C/CommitPart.cc
@@ -16,8 +16,8 @@ class CommitPart extends Entry{
     Boolean isLastPart = false;
     char[] data = NULL;
 
-    Pair<Long, Integer> partId = NULL;
-    Pair<Long, Long> commitId = NULL;
+    Pair<int64_t int32_t> partId = NULL;
+    Pair<int64_t, int64_t> commitId = NULL;
 
 
     CommitPart(Slot s, int64_t _machineId, int64_t _sequenceNumber, int64_t _transactionSequenceNumber, int _partNumber, char[] _data, Boolean _isLastPart) {
@@ -29,8 +29,8 @@ class CommitPart extends Entry{
         isLastPart = _isLastPart;
         data = _data;
 
-        partId = new Pair<Long, Integer>(sequenceNumber, partNumber);
-        commitId = new Pair<Long, Long>(machineId, sequenceNumber);
+        partId = new Pair<int64_t int32_t>(sequenceNumber, partNumber);
+        commitId = new Pair<int64_t, int64_t>(machineId, sequenceNumber);
     }
 
     int getSize() {
@@ -56,11 +56,11 @@ class CommitPart extends Entry{
         return data;
     }
 
-    Pair<Long, Integer> getPartId() {
+    Pair<int64_t int32_t> getPartId() {
         return partId;
     }
 
-    Pair<Long, Long> getCommitId() {
+    Pair<int64_t, int64_t> getCommitId() {
         return commitId;
     }
 
@@ -81,35 +81,35 @@ class CommitPart extends Entry{
     }
 
     static Entry decode(Slot s, ByteBuffer bb) {
-        int64_t machineId = bb.getLong();
-        int64_t sequenceNumber = bb.getLong();
-        int64_t transactionSequenceNumber = bb.getLong();
-        int partNumber = bb.getInt();
-        int dataSize = bb.getInt();
-        Boolean isLastPart = bb.get() == 1;
+        int64_t machineId = bb->getLong();
+        int64_t sequenceNumber = bb->getLong();
+        int64_t transactionSequenceNumber = bb->getLong();
+        int partNumber = bb->getInt();
+        int dataSize = bb->getInt();
+        Boolean isLastPart = bb->get() == 1;
 
         // Get the data
         char[] data = new char[dataSize];
-        bb.get(data);
+        bb->get(data);
 
         return new CommitPart(s, machineId, sequenceNumber, transactionSequenceNumber, partNumber, data, isLastPart);
     }
 
     void encode(ByteBuffer bb) {
-        bb.put(Entry.TypeCommitPart);
-        bb.putLong(machineId);
-        bb.putLong(sequenceNumber);
-        bb.putLong(transactionSequenceNumber);
-        bb.putInt(partNumber);
-        bb.putInt(data.length);
+        bb->put(Entry.TypeCommitPart);
+        bb->putLong(machineId);
+        bb->putLong(sequenceNumber);
+        bb->putLong(transactionSequenceNumber);
+        bb->putInt(partNumber);
+        bb->putInt(data.length);
 
         if (isLastPart) {
-            bb.put((char)1);
+            bb->put((char)1);
         } else {
-            bb.put((char)0);
+            bb->put((char)0);
         }
 
-        bb.put(data);
+        bb->put(data);
     }
 
     char getType() {