Skip to content

Commit

Permalink
dev-ros/joint_limits_interface: fix build with urdfdom1.
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.3.0
  • Loading branch information
aballier committed Jul 26, 2016
1 parent 7712f2a commit 55cf1fe
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
22 changes: 22 additions & 0 deletions dev-ros/joint_limits_interface/files/urdfdom1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Index: joint_limits_interface/include/joint_limits_interface/joint_limits_urdf.h
===================================================================
--- joint_limits_interface.orig/include/joint_limits_interface/joint_limits_urdf.h
+++ 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.
*/
-inline bool getJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
+inline bool getJointLimits(std::shared_ptr<const urdf::Joint> urdf_joint, JointLimits& limits)
{
if (!urdf_joint || !urdf_joint->limits)
{
@@ -84,7 +84,7 @@ inline bool getJointLimits(boost::shared
* \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.
*/
-inline bool getSoftJointLimits(boost::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
+inline bool getSoftJointLimits(std::shared_ptr<const urdf::Joint> urdf_joint, SoftJointLimits& soft_limits)
{
if (!urdf_joint || !urdf_joint->safety)
{
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ IUSE=""
RDEPEND="
dev-ros/roscpp
dev-ros/hardware_interface
dev-libs/urdfdom
>=dev-libs/urdfdom-1
"
DEPEND="${RDEPEND}
test? ( dev-ros/rostest dev-cpp/gtest )"
PATCHES=( "${FILESDIR}/urdfdom1.patch" )

0 comments on commit 55cf1fe

Please sign in to comment.