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

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

File:

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

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;
 };