Compiles

[iotcloud.git] / version2 / src / C / Entry.cc

diff --git a/version2/src/C/Entry.cc b/version2/src/C/Entry.cc
index 2bde6eb65a31ec8a0103713c48fc32f3a78c4666..097967bdae7d7af455e59283c93e49185e923cdd 100644 (file)
--- a/version2/src/C/Entry.cc
+++ b/version2/src/C/Entry.cc
@@ -1,5 +1,13 @@
 #include "Entry.h"
-
+#include "Slot.h"
+#include "ByteBuffer.h"
+#include "Abort.h"
+#include "CommitPart.h"
+#include "NewKey.h"
+#include "LastMessage.h"
+#include "RejectedMessage.h"
+#include "TableStatus.h"
+#include "TransactionPart.h"
 /**
  * Generic class that wraps all the different types of information
  * that can be stored in a Slot.
@@ -7,45 +15,34 @@
  * @version 1.0
  */
 
-Entry * Entry_decode(Slot * slot, ByteBuffer * bb) {
-  char type = bb->get();
-  switch (type) {
-    
-  case TypeCommitPart:
-    return CommitPart_decode(slot, bb);
-    
-  case TypeAbort:
-    return Abort_decode(slot, bb);
-    
-  case TypeTransactionPart:
-    return TransactionPart_decode(slot, bb);
-    
-  case TypeNewKey:
-    return NewKey_decode(slot, bb);
-    
-  case TypeLastMessage:
-    return LastMessage_decode(slot, bb);
-    
-  case TypeRejectedMessage:
-    return RejectedMessage_decode(slot, bb);
-    
-  case TypeTableStatus:
-    return TableStatus_decode(slot, bb);
-    
-  default:
-    ASSERT(0);
-  }
+Entry *Entry_decode(Slot *slot, ByteBuffer *bb) {
+       char type = bb->get();
+       switch (type) {
+       case TypeCommitPart:
+               return CommitPart_decode(slot, bb);
+       case TypeAbort:
+               return Abort_decode(slot, bb);
+       case TypeTransactionPart:
+               return TransactionPart_decode(slot, bb);
+       case TypeNewKey:
+               return NewKey_decode(slot, bb);
+       case TypeLastMessage:
+               return LastMessage_decode(slot, bb);
+       case TypeRejectedMessage:
+               return RejectedMessage_decode(slot, bb);
+       case TypeTableStatus:
+               return TableStatus_decode(slot, bb);
+
+       default:
+               ASSERT(0);
+       }
 }
 
 void Entry::setDead() {
-
-  if (!islive ) {
-    return; // already dead
-  }
-  
-  islive = false;
-  
-  if (parentslot != NULL) {
-    parentslot->decrementLiveCount();
-  }
+       if (islive) {
+               islive = false;
+               if (parentslot != NULL) {
+                       parentslot->decrementLiveCount();
+               }
+       }
 }