Suuports clang compiler

[anna.git] / source / comm / CompatCodec.cpp

diff --git a/source/comm/CompatCodec.cpp b/source/comm/CompatCodec.cpp
index 4664cba..600d9e1 100644 (file)
--- a/source/comm/CompatCodec.cpp
+++ b/source/comm/CompatCodec.cpp
@@ -199,17 +199,11 @@ throw(RuntimeException) {
   if(variable == NULL)
     throw RuntimeException(functions::asString("Id %d is not defined", id), ANNA_FILE_LOCATION);
 
-  switch(variable->isNull()) {
-  case true:
-
+  if(variable->isNull()) {
     if(isNull == false) a_nullCounter --;
-
-    break;
-  case false:
-
+  }
+  else {
     if(isNull == true) a_nullCounter ++;
-
-    break;
   }
 
   variable->setNull(isNull);
@@ -217,17 +211,11 @@ throw(RuntimeException) {
 
 void comm::CompatCodec::setNull(const comm::Variable* variable, const bool isNull)
 throw() {
-  switch(variable->isNull()) {
-  case true:
-
+  if(variable->isNull()) {
     if(isNull == false) a_nullCounter --;
-
-    break;
-  case false:
-
+  }
+  else {
     if(isNull == true) a_nullCounter ++;
-
-    break;
   }
 
   const_cast <comm::Variable*>(variable)->setNull(isNull);
@@ -281,10 +269,10 @@ throw(RuntimeException) {
 //-----------------------------------------------------------------------
 const DataBlock& comm::CompatCodec::code()
 throw(RuntimeException) {
-  register unsigned char c(0);
+  unsigned char c(0);
   iterator ii;
   iterator maxii(a_variables.end());
-  register Variable* variable;
+  Variable* variable;
   int stringLen;
   const char* string;
   char aux [sizeof(S64)];
@@ -349,6 +337,7 @@ throw(RuntimeException) {
         self += codec;
       }
       break;
+    default: break;
     }
   }
 
@@ -364,7 +353,7 @@ throw(RuntimeException) {
     char* data = const_cast <char*>(self.getData());
     int size = self.getSize();
 
-    for(register int i = 1, key = data [0]; i < size; i ++)
+    for(int i = 1, key = data [0]; i < size; i ++)
       data [i] ^= key ++;
   }
 
@@ -381,7 +370,7 @@ throw(RuntimeException) {
     throw RuntimeException("Can not decode an empty DataBlock", ANNA_FILE_LOCATION);
 
   if(data [0] != 0)
-    for(register int i = 1, key(data [0]); i < size; i ++)
+    for(int i = 1, key(data [0]); i < size; i ++)
       const_cast <char*>(data)[i] ^= key ++;
 
   LOGDEBUG(Logger::write(Logger::Debug, "comm::CompatCodec::decode", dataBlock, ANNA_FILE_LOCATION));
@@ -586,7 +575,7 @@ throw() {
 
 comm::Variable* comm::CompatCodec::VariableContainer::find(const int id)
 throw() {
-  for(register int ii = 0; ii < a_size; ii ++) {
+  for(int ii = 0; ii < a_size; ii ++) {
     if(a_variables [ii]->getId() == id)
       return a_variables [ii];
   }
@@ -596,7 +585,7 @@ throw() {
 
 const comm::Variable* comm::CompatCodec::VariableContainer::find(const int id) const
 throw() {
-  for(register int ii = 0; ii < a_size; ii ++) {
+  for(int ii = 0; ii < a_size; ii ++) {
     if(a_variables [ii]->getId() == id)
       return a_variables [ii];
   }