TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warning. "const int" return type makes no sense

Browse Source
This commit is contained in:
rdb 2014-11-18 19:50:07 +00:00
parent 9f46ad7835
commit 963186e1ec
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
panda/src/bullet/bulletContactResult.I
View File

@ -51,7 +51,7 @@ get_manifold_point() {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const int BulletContact:: INLINE int BulletContact::
get_idx0() const { get_idx0() const {
return _idx0; return _idx0;
@ -62,7 +62,7 @@ get_idx0() const {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const int BulletContact:: INLINE int BulletContact::
get_idx1() const { get_idx1() const {
return _idx1; return _idx1;
@ -73,7 +73,7 @@ get_idx1() const {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const int BulletContact:: INLINE int BulletContact::
get_part_id0() const { get_part_id0() const {
return _part_id0; return _part_id0;
@ -84,7 +84,7 @@ get_part_id0() const {
// Access: Published // Access: Published
// Description: // Description:
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const int BulletContact:: INLINE int BulletContact::
get_part_id1() const { get_part_id1() const {
return _part_id1; return _part_id1;
@ -112,4 +112,3 @@ get_contact(int idx) {
nassertr(idx >= 0 && idx < (int)_contacts.size(), _empty); nassertr(idx >= 0 && idx < (int)_contacts.size(), _empty);
return _contacts[idx]; return _contacts[idx];
} }

8
panda/src/bullet/bulletContactResult.h
View File

@ -36,10 +36,10 @@ PUBLISHED:
INLINE BulletManifoldPoint &get_manifold_point(); INLINE BulletManifoldPoint &get_manifold_point();
INLINE PandaNode *get_node0() const; INLINE PandaNode *get_node0() const;
INLINE PandaNode *get_node1() const; INLINE PandaNode *get_node1() const;
INLINE const int get_idx0() const; INLINE int get_idx0() const;
INLINE const int get_idx1() const; INLINE int get_idx1() const;
INLINE const int get_part_id0() const; INLINE int get_part_id0() const;
INLINE const int get_part_id1() const; INLINE int get_part_id1() const;
private: private:
static btManifoldPoint _empty; static btManifoldPoint _empty;