Fix std::placeholders namespace conflict

henningkayser · henningkayser · commit 9214de8d585b · 2021-09-29T17:50:10.000Z
diff --git a/moveit_ros/moveit_servo/src/servo_parameters.cpp b/moveit_ros/moveit_servo/src/servo_parameters.cpp
@@ -43,8 +43,6 @@
 #include <rclcpp/rclcpp.hpp>
 #include <type_traits>
 
-using namespace std::placeholders;  // for _1, _2 etc.
-
 namespace moveit_servo
 {
 rcl_interfaces::msg::SetParametersResult
@@ -236,6 +234,7 @@ ServoParameters::SharedConstPtr ServoParameters::makeServoParameters(const rclcp
   // register parameter change callback
   if (dynamic_parameters)
   {
+    using std::placeholders::_1;
     parameters->on_set_parameters_callback_handler_ =
         node->add_on_set_parameters_callback(std::bind(&ServoParameters::setParametersCallback, parameters.get(), _1));
   }

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@`
`43`	`43`	`#include <rclcpp/rclcpp.hpp>`
`44`	`44`	`#include <type_traits>`
`45`	`45`
`46`		`-using namespace std::placeholders; // for _1, _2 etc.`
`47`		`-`
`48`	`46`	`namespace moveit_servo`
`49`	`47`	`{`
`50`	`48`	`rcl_interfaces::msg::SetParametersResult`
`@@ -236,6 +234,7 @@ ServoParameters::SharedConstPtr ServoParameters::makeServoParameters(const rclcp`
`236`	`234`	`// register parameter change callback`
`237`	`235`	`if (dynamic_parameters)`
`238`	`236`	`{`
	`237`	`+ using std::placeholders::_1;`
`239`	`238`	`parameters->on_set_parameters_callback_handler_ =`
`240`	`239`	`node->add_on_set_parameters_callback(std::bind(&ServoParameters::setParametersCallback, parameters.get(), _1));`
`241`	`240`	`}`