Changeset 1008 for code/branches/network/src/network/Synchronisable.cc

Timestamp:

Apr 10, 2008, 12:55:35 PM (16 years ago)

Author:

dumenim

Message:

changed some comments and catched some return values and maybe some stuff we have to unchange

File:

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

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

@@ -44 +44 @@
     // increase datasize
     datasize+=sizeof(int)+size;
-    // push temp to syncList (at the bottom)
+    //std::cout << "push temp to syncList (at the bottom) " << datasize << std::endl;
     syncList.push_back(temp);
   }
@@ -104 +104 @@
   */
   syncData Synchronisable::getData(unsigned char *mem){
-    std::list<synchronisableVariable>::iterator i;
+    //std::cout << "inside getData" << std::endl;
+    std::list<SYNCVAR>::iterator i;
     syncData retVal;
     retVal.objectID=this->objectID;
@@ -113 +114 @@
     int n=0;
     for(i=syncList.begin(); n<datasize && i!=syncList.end(); ++i){
-      //COUT(2) << "size of variable: " << i->size << std::endl;
       //(std::memcpy(retVal.data+n, (const void*)(&(i->size)), sizeof(int));
       memcpy( (void *)(retVal.data+n), (const void*)&(i->size), sizeof(int) );
@@ -166 +166 @@
   int Synchronisable::getSize(){
     int tsize=0;
-    std::list<synchronisableVariable>::iterator i;
+    std::list<SYNCVAR>::iterator i;
     for(i=syncList.begin(); i!=syncList.end(); i++){
       switch(i->type){
-    case DATA:
-      tsize+=sizeof(int);
-      tsize+=i->size;
-      break;
-    case STRING:
-      tsize+=sizeof(int);
-      tsize+=((std::string *)i->var)->length()+1;
-      break;
+      case DATA:
+        tsize+=sizeof(int);
+        tsize+=i->size;
+        break;
+      case STRING:
+        tsize+=sizeof(int);
+        tsize+=((std::string *)i->var)->length()+1;
+        break;
       }
     }