Skip to content

Commit

Permalink
add boost prefix to _1
Browse files Browse the repository at this point in the history
this relied on an implicit include of `boost/bind.hpp` from the ros_comm
headers and ROS-O changes this include due to countless downstream warnings.
ros-o/ros_comm#3
  • Loading branch information
v4hn committed Aug 6, 2024
1 parent 526fa72 commit 7f34d64
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions joint_trajectory_generator/src/joint_trajectory_generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace joint_trajectory_generator {
public:
JointTrajectoryGenerator(std::string name) :
as_(ros::NodeHandle(), "joint_trajectory_generator",
boost::bind(&JointTrajectoryGenerator::executeCb, this, _1),
boost::bind(&JointTrajectoryGenerator::executeCb, this, boost::placeholders::_1),
false),
ac_("joint_trajectory_action"),
got_state_(false)
Expand Down Expand Up @@ -174,7 +174,7 @@ namespace joint_trajectory_generator {
return;
}

ac_.sendGoal(full_goal, JTAC::SimpleDoneCallback(), JTAC::SimpleActiveCallback(), boost::bind(&JointTrajectoryGenerator::feedbackCb, this, _1));
ac_.sendGoal(full_goal, JTAC::SimpleDoneCallback(), JTAC::SimpleActiveCallback(), boost::bind(&JointTrajectoryGenerator::feedbackCb, this, boost::placeholders::_1));

while(ros::ok() && !ac_.waitForResult(ros::Duration(0.05))){
if(as_.isPreemptRequested()){
Expand All @@ -184,7 +184,7 @@ namespace joint_trajectory_generator {
full_goal = createGoal(*new_goal);
ac_.sendGoal(full_goal, JTAC::SimpleDoneCallback(),
JTAC::SimpleActiveCallback(),
boost::bind(&JointTrajectoryGenerator::feedbackCb, this, _1));
boost::bind(&JointTrajectoryGenerator::feedbackCb, this, boost::placeholders::_1));
}
else{
ROS_DEBUG("Preempted by cancel");
Expand Down

0 comments on commit 7f34d64

Please sign in to comment.