Skip to content

Commit

Permalink
Merge pull request #115 from fkanehiro/return_type
Browse files Browse the repository at this point in the history
changes return types of numXXX()
  • Loading branch information
fkanehiro authored Sep 8, 2016
2 parents e447513 + 56d2c4d commit 4337f85
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions hrplib/hrpModel/Body.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace hrp {
In other words, the value represents the size of the link sequence
obtained by joint() function.
*/
inline int numJoints() const {
inline unsigned int numJoints() const {
return jointIdToLinkArray.size();
}

Expand All @@ -109,7 +109,7 @@ namespace hrp {
The number of all the links the body has.
The value corresponds to the size of the sequence obtained by link() function.
*/
inline int numLinks() const {
inline unsigned int numLinks() const {
return linkTraverse_.numLinks();
}

Expand Down Expand Up @@ -159,11 +159,11 @@ namespace hrp {
return allSensors[sensorType][sensorId];
}

inline int numSensors(int sensorType) const {
inline unsigned int numSensors(int sensorType) const {
return allSensors[sensorType].size();
}

inline int numSensorTypes() const {
inline unsigned int numSensorTypes() const {
return allSensors.size();
}

Expand Down
2 changes: 1 addition & 1 deletion hrplib/hrpModel/JointPath.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace hrp {
return joints.empty();
}

inline int numJoints() const {
inline unsigned int numJoints() const {
return joints.size();
}

Expand Down
2 changes: 1 addition & 1 deletion hrplib/hrpModel/LinkTraverse.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace hrp {

virtual void find(Link* root, bool doUpward = false, bool doDownward = true);

inline int numLinks() const {
inline unsigned int numLinks() const {
return links.size();
}

Expand Down

0 comments on commit 4337f85

Please sign in to comment.