Changeset 7214 in orxonox.OLD for branches/std/src/lib/lang/base_object.h

Timestamp:

Mar 10, 2006, 7:18:03 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the branche works again, as it did before

File:

• branches/std/src/lib/lang/base_object.h (modified) (2 diffs)

branches/std/src/lib/lang/base_object.h

@@ -33 +33 @@
   void setName (const std::string& newName);
   /** returns the Name of this Object */
-  inline const char* getName ()const { return this->objectName; };
+  inline const char* getName ()const { return this->objectName.c_str(); };
   /** @returns the XML-Element with whicht this Object was loaded */
   inline TiXmlNode* getXmlElem() const { return this->xmlElem; };
@@ -60 +60 @@
     const char*        className;        //!< the name of the class
     long               classID;          //!< this is the id from the class_id.h enumeration
-    char*              objectName;       //!< The name of this object
+    std::string        objectName;       //!< The name of this object
 
     ClassList*         classList;        //!< Pointer to the ClassList this Object is inside of