Changeset 6815 in orxonox.OLD for trunk/src/lib/lang/base_object.cc

Timestamp:

Jan 28, 2006, 5:11:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/network back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6774:HEAD

no conflicts…
thats what i call orthogonal work

File:

• trunk/src/lib/lang/base_object.cc (modified) (2 diffs)

trunk/src/lib/lang/base_object.cc

@@ -204 +204 @@
     objectName = NULL;
   }
-  SYNCHELP_READ_STRINGM( this->objectName );
+  SYNCHELP_READ_STRINGM( this->objectName, NWT_BO_NAME );
   if ( this->objectName && !strcmp(this->objectName, "") )
   {
@@ -225 +225 @@
 
   //PRINTF(0)("objectname = %s\n", this->objectName);
-  SYNCHELP_WRITE_STRING( this->objectName );
+  SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
 
   return SYNCHELP_WRITE_N;