Changeset 1170 for code/branches/network3/src/network/Synchronisable.cc

Timestamp:

Apr 24, 2008, 3:06:20 PM (16 years ago)

Author:

scheusso

Message:

changed synchronisable (size of data wont be sended anymore

File:

• code/branches/network3/src/network/Synchronisable.cc (modified) (4 diffs)

code/branches/network3/src/network/Synchronisable.cc

@@ -151 +151 @@
     for(i=syncList->begin(); n<datasize && i!=syncList->end(); ++i){
       //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
-      memcpy( (void *)(retVal.data+n), (const void *)&((*i)->size), sizeof(int) );
-      n+=sizeof(int);
       switch((*i)->type){
       case DATA:
@@ -159 +157 @@
         break;
       case STRING:
+        memcpy( (void *)(retVal.data+n), (const void *)&((*i)->size), sizeof(int) );
+        n+=sizeof(int);
         std::memcpy( retVal.data+n, (const void*)( ( (std::string *) (*i)->var)->c_str()), (*i)->size);
         n+=(*i)->size;
@@ -182 +182 @@
     for(i=syncList->begin(); i!=syncList->end(); i++){
       COUT(5) << "Synchronisable: element size: " << (*i)->size << " type: " << (*i)->type << std::endl;
-      if(*(int *)data==(*i)->size || (*i)->type==STRING){
-        switch((*i)->type){
-        case DATA:
-          data+=sizeof(int);
-          memcpy((void*)(*i)->var, data, (*i)->size);
-          data+=(*i)->size;
-          break;
-        case STRING:
-          (*i)->size = *(int *)data;
-          data+=sizeof(int);
-          *((std::string *)((*i)->var)) = std::string((const char*)data);
-          data += (*i)->size;
-          break;
-        }
-      } else
-        return false; //there was some problem with registerVar
+      switch((*i)->type){
+      case DATA:
+        memcpy((void*)(*i)->var, data, (*i)->size);
+        data+=(*i)->size;
+        break;
+      case STRING:
+        (*i)->size = *(int *)data;
+        data+=sizeof(int);
+        *((std::string *)((*i)->var)) = std::string((const char*)data);
+        data += (*i)->size;
+        break;
+      }
     }
     return true;
@@ -212 +208 @@
       switch((*i)->type){
       case DATA:
-        tsize+=sizeof(int);
         tsize+=(*i)->size;
         break;