Changeset 7230 in orxonox.OLD for trunk/src/lib/lang

Timestamp:

Mar 21, 2006, 3:20:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std::branche back

File:

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

trunk/src/lib/lang/base_object.cc

@@ -186 +186 @@
 int BaseObject::writeState( const byte * data, int length, int sender )
 {
-  /// FIXME STD
-
-  /*  SYNCHELP_READ_BEGIN();
-
-  if ( !objectName.empty() )
-  {
-    delete[] objectName;
-    objectName = NULL;
-  }
-  SYNCHELP_READ_STRINGM( this->objectName, NWT_BO_NAME );
-  if ( this->objectName && !strcmp(this->objectName, "") )
-  {
-    delete[] this->objectName;
-    this->objectName = NULL;
-  }
-
-  return SYNCHELP_READ_N;*/
+  SYNCHELP_READ_BEGIN();
+
+  SYNCHELP_READ_STRING( this->objectName, NWT_BO_NAME );
+
+  return SYNCHELP_READ_N;
 }
 
@@ -213 +201 @@
 int BaseObject::readState( byte * data, int maxLength )
 {
-///FIXME STD
-  /*  SYNCHELP_WRITE_BEGIN();
+  SYNCHELP_WRITE_BEGIN();
 
   //PRINTF(0)("objectname = %s\n", this->objectName);
   SYNCHELP_WRITE_STRING( this->objectName, NWT_BO_NAME );
 
-  return SYNCHELP_WRITE_N;*/
-}
+  return SYNCHELP_WRITE_N;
+}