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

Timestamp:

Apr 28, 2008, 11:09:34 PM (16 years ago)

Author:

scheusso

Message:

diffing work now: wohoo

File:

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

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

@@ -147 +147 @@
     retVal.classID=this->classID;
     retVal.length=getSize();
-    COUT(4) << "Synchronisable getting data from objectID: " << retVal.objectID << " classID: " << retVal.classID << " length: " << retVal.length << std::endl;
+    COUT(5) << "Synchronisable getting data from objectID: " << retVal.objectID << " classID: " << retVal.classID << " length: " << retVal.length << std::endl;
     retVal.data=mem;
     // copy to location
@@ -163 +163 @@
         const char *data = ( ( *(std::string *) (*i)->var).c_str());
         std::memcpy( retVal.data+n, (void*)data, (*i)->size);
-        COUT(4) << "synchronisable: char: " << (const char *)(retVal.data+n) << " data: " << data << " string: " << *(std::string *)((*i)->var) << std::endl;
+        COUT(5) << "synchronisable: char: " << (const char *)(retVal.data+n) << " data: " << data << " string: " << *(std::string *)((*i)->var) << std::endl;
         n+=(*i)->size;
         break;
@@ -193 +193 @@
       case STRING:
         (*i)->size = *(int *)data;
-        COUT(4) << "string size: " << (*i)->size << std::endl;
+        COUT(5) << "string size: " << (*i)->size << std::endl;
         data+=sizeof(int);
         *((std::string *)((*i)->var)) = std::string((const char*)data);
-        COUT(4) << "synchronisable: char: " << (const char*)data << " string: " << std::string((const char*)data) << std::endl;
+        COUT(5) << "synchronisable: char: " << (const char*)data << " string: " << std::string((const char*)data) << std::endl;
         data += (*i)->size;
         break;
@@ -219 +219 @@
         tsize+=sizeof(int);
         (*i)->size=((std::string *)(*i)->var)->length()+1;
-        COUT(4) << "String size: " << (*i)->size << std::endl;
+        COUT(5) << "String size: " << (*i)->size << std::endl;
         tsize+=(*i)->size;
         break;