Merge pull request #1 from ros-controls/indigo-devel

updates from ros-control
ipa-cob4-2 · Oct 2, 2014 · 61309a6 · 61309a6
2 parents 60bd6ef + c9bb56f
commit 61309a6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/joint_limits_interface/include/joint_limits_interface/joint_limits_rosparam.h b/joint_limits_interface/include/joint_limits_interface/joint_limits_rosparam.h
@@ -72,7 +72,7 @@ namespace joint_limits_interface
  * existing values. Values in \p limits not specified in the parameter server remain unchanged.
  * \return True if a limits specification is found (ie. the \p joint_limits/joint_name parameter exists in \p nh), false otherwise.
  */
-bool getJointLimits(const std::string& joint_name, const ros::NodeHandle& nh, JointLimits& limits)
+inline bool getJointLimits(const std::string& joint_name, const ros::NodeHandle& nh, JointLimits& limits)
 {
   // Node handle scoped where the joint limits are defined
   ros::NodeHandle limits_nh;

diff --git a/joint_limits_interface/include/joint_limits_interface/joint_limits_urdf.h b/joint_limits_interface/include/joint_limits_interface/joint_limits_urdf.h
@@ -48,7 +48,7 @@ namespace joint_limits_interface
  * values. Values in \e limits not present in \e urdf_joint remain unchanged.
  * \return True if \e urdf_joint has a valid limits specification, false otherwise.
  */
-bool getJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
+inline bool getJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
 {
   if (!urdf_joint || !urdf_joint->limits)
   {
@@ -84,7 +84,7 @@ bool getJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, JointLimits
  * \param[out] soft_limits Where URDF soft joint limit data gets written into.
  * \return True if \e urdf_joint has a valid soft limits specification, false otherwise.
  */
-bool getSoftJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
+inline bool getSoftJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
 {
   if (!urdf_joint || !urdf_joint->safety)
   {