Remove core-comm dependency through CounterManager/timex in core/oam subsystem. Basic...

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

diff --git a/source/comm/CompatCodec.cpp b/source/comm/CompatCodec.cpp
index 1243fb6..6d0c5a1 100644 (file)
--- a/source/comm/CompatCodec.cpp
+++ b/source/comm/CompatCodec.cpp
@@ -120,9 +120,9 @@ throw(RuntimeException) {
   return result;
 }
 
-const comm::Variable* comm::CompatCodec::attach(const char* name, const short int id, Integer64& value)
+const comm::Variable* comm::CompatCodec::attach(const char* name, const short int id, S64& value)
 throw(RuntimeException) {
-  const Integer64 backup(value);
+  const S64 backup(value);
   const Variable* result = insert(name, id, a_variables, value);
   value = backup;
   return result;
@@ -287,7 +287,7 @@ throw(RuntimeException) {
   register Variable* variable;
   int stringLen;
   const char* string;
-  char aux [sizeof(Integer64)];
+  char aux [sizeof(S64)];
 
   if(a_scramble == true)     // (1)
     while(c == 0) c = rand() % 0xff;
@@ -317,7 +317,7 @@ throw(RuntimeException) {
       break;
     case Variable::Type::Integer64:
       self += variable->codec();
-      self.append(comm::functions::codeInteger64(aux, variable->getInteger64()), sizeof(Integer64));
+      self.append(comm::functions::codeInteger64(aux, variable->getInteger64()), sizeof(S64));
       break;
     case Variable::Type::Boolean:
       self.append(comm::functions::codeShort(aux, variable->getId()), sizeof(short int));      // (3)
@@ -440,7 +440,7 @@ throw(RuntimeException) {
       break;
     case Variable::Type::Integer64:
       variable->setValue(comm::functions::decodeInteger64(++ data));
-      data += sizeof(Integer64);
+      data += sizeof(S64);
       break;
     case  Variable::Type::Boolean:
       variable->setBoolean((*data & 0x80) ? true : false);
@@ -515,7 +515,7 @@ throw(RuntimeException) {
       break;
     case Variable::Type::Integer64:
       variable->setValue(comm::functions::decodeInteger64(++ data));
-      data += sizeof(Integer64);
+      data += sizeof(S64);
       break;
     case  Variable::Type::Boolean:
       variable->setBoolean((*data & 0x80) ? true : false);