Browse Source

Fixing compile error on Linux.

enn0x 15 years ago
parent
commit
2b1f43f5d8

+ 1 - 1
panda/src/physx/physxActor.I

@@ -55,7 +55,7 @@ ls() const {
 INLINE void PhysxActor::
 ls(ostream &out, int indent_level) const {
 
-  char *name = _name ? _name : "";
+  const char *name = _name ? _name : "";
 
   indent(out, indent_level) << get_type().get_name()
                             << " " << name

+ 1 - 1
panda/src/physx/physxCloth.I

@@ -55,7 +55,7 @@ ls() const {
 INLINE void PhysxCloth::
 ls(ostream &out, int indent_level) const {
 
-  char *name = _name ? _name : "";
+  const char *name = _name ? _name : "";
 
   indent(out, indent_level) << get_type().get_name()
                             << " " << name

+ 3 - 1
panda/src/physx/physxForceField.I

@@ -55,8 +55,10 @@ ls() const {
 INLINE void PhysxForceField::
 ls(ostream &out, int indent_level) const {
 
+  const char *name = _name ? _name : "";
+
   indent(out, indent_level) << get_type().get_name()
-                            << " " << get_name()
+                            << " " << name
                             << " (at 0x" << this << ")\n";
 }
 

+ 1 - 1
panda/src/physx/physxForceFieldShape.I

@@ -44,7 +44,7 @@ ls() const {
 INLINE void PhysxForceFieldShape::
 ls(ostream &out, int indent_level) const {
 
-  char *name = _name ? _name : "";
+  const char *name = _name ? _name : "";
 
   indent(out, indent_level) << get_type().get_name()
                             << " " << name

+ 3 - 1
panda/src/physx/physxForceFieldShapeGroup.I

@@ -55,8 +55,10 @@ ls() const {
 INLINE void PhysxForceFieldShapeGroup::
 ls(ostream &out, int indent_level) const {
 
+  const char *name = _name ? _name : "";
+
   indent(out, indent_level) << get_type().get_name()
-                            << " " << get_name()
+                            << " " << name
                             << " (at 0x" << this << ")\n";
 
   _shapes.ls(out, indent_level);

+ 1 - 1
panda/src/physx/physxJoint.I

@@ -44,7 +44,7 @@ ls() const {
 INLINE void PhysxJoint::
 ls(ostream &out, int indent_level) const {
 
-  char *name = _name ? _name : "";
+  const char *name = _name ? _name : "";
 
   indent(out, indent_level) << get_type().get_name()
                             << " " << name

+ 1 - 1
panda/src/physx/physxShape.I

@@ -44,7 +44,7 @@ ls() const {
 INLINE void PhysxShape::
 ls(ostream &out, int indent_level) const {
 
-  char *name = _name ? _name : "";
+  const char *name = _name ? _name : "";
 
   indent(out, indent_level) << get_type().get_name()
                             << " " << name