use boost::placeholders::_1/_2 in remaining instances, include boost/…

…bind/bind.hpp instead of boost/bind.hpp, eliminated unnecessary bind.hpp include
ros-controls · May 19, 2022 · 5e4075b · 5e4075b
1 parent c255fca
commit 5e4075b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/ackermann_steering_controller/src/odometry.cpp b/ackermann_steering_controller/src/odometry.cpp
@@ -42,7 +42,7 @@
 
 #include <ackermann_steering_controller/odometry.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ackermann_steering_controller
 {
@@ -61,7 +61,7 @@ namespace ackermann_steering_controller
   , velocity_rolling_window_size_(velocity_rolling_window_size)
   , linear_acc_(RollingWindow::window_size = velocity_rolling_window_size)
   , angular_acc_(RollingWindow::window_size = velocity_rolling_window_size)
-  , integrate_fun_(boost::bind(&Odometry::integrateExact, this, _1, _2))
+  , integrate_fun_(boost::bind(&Odometry::integrateExact, this, boost::placeholders::_1, boost::placeholders::_2))
   {
   }
 

diff --git a/diff_drive_controller/src/odometry.cpp b/diff_drive_controller/src/odometry.cpp
@@ -41,7 +41,7 @@
 
 #include <diff_drive_controller/odometry.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace diff_drive_controller
 {
@@ -62,7 +62,7 @@ namespace diff_drive_controller
   , velocity_rolling_window_size_(velocity_rolling_window_size)
   , linear_acc_(RollingWindow::window_size = velocity_rolling_window_size)
   , angular_acc_(RollingWindow::window_size = velocity_rolling_window_size)
-  , integrate_fun_(boost::bind(&Odometry::integrateExact, this, _1, _2))
+  , integrate_fun_(boost::bind(&Odometry::integrateExact, this, boost::placeholders::_1, boost::placeholders::_2))
   {
   }
 

diff --git a/four_wheel_steering_controller/src/odometry.cpp b/four_wheel_steering_controller/src/odometry.cpp
@@ -34,8 +34,6 @@
 
 #include <four_wheel_steering_controller/odometry.h>
 
-#include <boost/bind.hpp>
-
 namespace four_wheel_steering_controller
 {
   namespace bacc = boost::accumulators;