edits

diff --git a/version2/src/C/Abort.cc b/version2/src/C/Abort.cc
index 619c02d6660b49774a39863166708af328686b1c..32dd99e834a4b21e77039ab13a327cfa85159bc7 100644 (file)
--- a/version2/src/C/Abort.cc
+++ b/version2/src/C/Abort.cc
@@ -8,7 +8,7 @@ Abort::Abort(Slot * slot, int64_t _transactionClientLocalSequenceNumber, int64_t
   transactionMachineId(_transactionMachineId),
   transactionArbitrator(_transactionArbitrator),
   arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
-  abortId(new Pair<uint64_t, uint64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
+  abortId(new Pair<int64_t, int64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
 }
 
 Abort::Abort(Slot * slot, int64_t _transactionClientLocalSequenceNumber, int64_t _transactionSequenceNumber, int64_t _sequenceNumber ,  int64_t _transactionMachineId, int64_t _transactionArbitrator, int64_t _arbitratorLocalSequenceNumber) :
@@ -19,7 +19,7 @@ Abort::Abort(Slot * slot, int64_t _transactionClientLocalSequenceNumber, int64_t
   transactionMachineId(_transactionMachineId),
   transactionArbitrator(_transactionArbitrator),
   arbitratorLocalSequenceNumber(_arbitratorLocalSequenceNumber),
-  abortId(new Pair<uint64_t, uint64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
+  abortId(new Pair<int64_t, int64_t>(transactionMachineId, transactionClientLocalSequenceNumber)) {
 }
 
 Entry * Abortdecode(Slot * slot, ByteBuffer * bb) {
@@ -34,7 +34,7 @@ Entry * Abortdecode(Slot * slot, ByteBuffer * bb) {
 }
 
 void Abort::encode(ByteBuffer * bb) {
-  bb->put(Entry.TypeAbort);
+  bb->put(TypeAbort);
   bb->putLong(transactionClientLocalSequenceNumber);
   bb->putLong(transactionSequenceNumber);
   bb->putLong(sequenceNumber);

diff --git a/version2/src/C/Abort.h b/version2/src/C/Abort.h
index 4b15cd32157a9cbd041bec759090a6969ea843f9..d03d8455f7309a203ce8c8720bbcd849fc171f29 100644 (file)
--- a/version2/src/C/Abort.h
+++ b/version2/src/C/Abort.h
@@ -29,7 +29,7 @@ class Abort : public Entry {
        void setSequenceNumber(int64_t _sequenceNumber) { sequenceNumber = _sequenceNumber; }
        int64_t getTransactionArbitrator() { return transactionArbitrator; }
 
-       void encode(ByteBuffer bb);
+       void encode(ByteBuffer * bb);
        int getSize() { return (6 * sizeof(uint64_t)) + sizeof(char); }
        char getType() { return TypeAbort; }
        Entry * getCopy(Slot * s) { return new Abort(s, transactionClientLocalSequenceNumber, transactionSequenceNumber, sequenceNumber, transactionMachineId, transactionArbitrator, arbitratorLocalSequenceNumber); }

diff --git a/version2/src/C/Entry.h b/version2/src/C/Entry.h
index c474d421320170050e8875ba0c5913917522ec96..c3cc8a23d2eda3892d17938e42557d0fbcc963b7 100644 (file)
--- a/version2/src/C/Entry.h
+++ b/version2/src/C/Entry.h
@@ -43,26 +43,26 @@ class Entry : public Liveness {
        /**
         * Serializes the Entry object into the char buffer.
         */
-  void encode(ByteBuffer bb) = 0;
+  virtual void encode(ByteBuffer * bb) = 0;
 
 
        /**
         * Returns the size in chars the entry object will take in the char
         * array.
         */
-  int getSize() = 0;
+  virtual int getSize() = 0;
 
 
        /**
         * Returns a char encoding the type of the entry object.
         */
-  char getType() = 0;
+  virtual char getType() = 0;
 
 
        /**
         * Returns a copy of the Entry that can be added to a different slot.
         */
-  Entry * getCopy(Slot * s) = 0;
+  virtual Entry * getCopy(Slot * s) = 0;
 };
 
 /**

diff --git a/version2/src/C/Pair.h b/version2/src/C/Pair.h
index 4e719c4ef1700c7f4df2816adcaf96af6b77b456..127f9f8543eb7fdcb8d3067bab370e3953d12a22 100644 (file)
--- a/version2/src/C/Pair.h
+++ b/version2/src/C/Pair.h
@@ -3,10 +3,11 @@
 
 template<typename A, typename B>
 class Pair {
-private:
+ private:
   A a;
   B b;
-  
+       
+ public:  
        Pair(A _a, B _b) :
     a(_a),
     b(_b) {