From 2b1f43f5d8258077fb178e3aab6e8368cc65b28e Mon Sep 17 00:00:00 2001 From: enn0x Date: Tue, 29 Jun 2010 18:20:10 +0000 Subject: [PATCH] Fixing compile error on Linux. --- panda/src/physx/physxActor.I | 2 +- panda/src/physx/physxCloth.I | 2 +- panda/src/physx/physxForceField.I | 4 +++- panda/src/physx/physxForceFieldShape.I | 2 +- panda/src/physx/physxForceFieldShapeGroup.I | 4 +++- panda/src/physx/physxJoint.I | 2 +- panda/src/physx/physxShape.I | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/panda/src/physx/physxActor.I b/panda/src/physx/physxActor.I index a4f2477c5a..c55a74c69b 100644 --- a/panda/src/physx/physxActor.I +++ b/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 diff --git a/panda/src/physx/physxCloth.I b/panda/src/physx/physxCloth.I index 6223948369..f1ad23b9e9 100644 --- a/panda/src/physx/physxCloth.I +++ b/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 diff --git a/panda/src/physx/physxForceField.I b/panda/src/physx/physxForceField.I index 3aff844847..d589ecba35 100644 --- a/panda/src/physx/physxForceField.I +++ b/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"; } diff --git a/panda/src/physx/physxForceFieldShape.I b/panda/src/physx/physxForceFieldShape.I index 1272172336..2077036d77 100644 --- a/panda/src/physx/physxForceFieldShape.I +++ b/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 diff --git a/panda/src/physx/physxForceFieldShapeGroup.I b/panda/src/physx/physxForceFieldShapeGroup.I index 3f9a477291..5044cee77c 100644 --- a/panda/src/physx/physxForceFieldShapeGroup.I +++ b/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); diff --git a/panda/src/physx/physxJoint.I b/panda/src/physx/physxJoint.I index 8635a86b09..06beb9e76c 100644 --- a/panda/src/physx/physxJoint.I +++ b/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 diff --git a/panda/src/physx/physxShape.I b/panda/src/physx/physxShape.I index 3af58bac76..3a1b44bad2 100644 --- a/panda/src/physx/physxShape.I +++ b/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