Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/lib/lang

Timestamp:

May 24, 2005, 10:32:34 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

Location:

orxonox/branches/physics/src/lib/lang

Files:

• base_object.cc (modified) (1 diff)
• base_object.h (modified) (2 diffs)

orxonox/branches/physics/src/lib/lang/base_object.cc

@@ -39 +39 @@
 BaseObject::~BaseObject () 
 {
-  delete []this->className;
+  //  delete []this->className;
 }
 
-void BaseObject::setClassName (char* className)
+void BaseObject::setClassName (const char* className)
 {
-  this->className = new char[strlen(className)+1];
-  strcpy(this->className, className);
-}
-
-char* BaseObject::getClassName(void) const
-{
-  return className;
+  this->className = className;
 }
 

orxonox/branches/physics/src/lib/lang/base_object.h

@@ -17 +17 @@
   virtual ~BaseObject ();
 
-  void setClassName (char* className);
-  char* getClassName(void) const;
+  void setClassName (const char* className);
+  inline const char* getClassName(void) const { return this->className;};
   bool isA (char* className);
 
@@ -25 +25 @@
 
  private:
-  char* className;
+  const char* className;
   bool finalized;
 };