From f2f1be43370d87666c65252bbf7d2029e6854177 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 17 May 2022 10:28:31 -0700 Subject: [PATCH 1/3] use boost::placeholders::_1/_2 instead of deprecated _1/_2 --- actionlib_tutorials/src/fibonacci_class_client.cpp | 2 +- actionlib_tutorials/src/fibonacci_server.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/actionlib_tutorials/src/fibonacci_class_client.cpp b/actionlib_tutorials/src/fibonacci_class_client.cpp index 8b3979f..6898703 100644 --- a/actionlib_tutorials/src/fibonacci_class_client.cpp +++ b/actionlib_tutorials/src/fibonacci_class_client.cpp @@ -22,7 +22,7 @@ class MyNode // Need boost::bind to pass in the 'this' pointer ac.sendGoal(goal, - boost::bind(&MyNode::doneCb, this, _1, _2), + boost::bind(&MyNode::doneCb, this, boost::placeholders::_1, boost::placeholders::_2), Client::SimpleActiveCallback(), Client::SimpleFeedbackCallback()); diff --git a/actionlib_tutorials/src/fibonacci_server.cpp b/actionlib_tutorials/src/fibonacci_server.cpp index 51a51bd..dde3ecf 100644 --- a/actionlib_tutorials/src/fibonacci_server.cpp +++ b/actionlib_tutorials/src/fibonacci_server.cpp @@ -16,7 +16,7 @@ class FibonacciAction public: FibonacciAction(std::string name) : - as_(nh_, name, boost::bind(&FibonacciAction::executeCB, this, _1), false), + as_(nh_, name, boost::bind(&FibonacciAction::executeCB, this, boost::placeholders::_1), false), action_name_(name) { as_.start(); From 7ad62ff8c432cf20e2ab036aa095671acac5e875 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 23 Dec 2022 15:43:56 -0800 Subject: [PATCH 2/3] class_list_macros.h is now hpp, also class_loader --- nodelet_tutorial_math/src/plus.cpp | 2 +- pluginlib_tutorials/src/polygon_loader.cpp | 2 +- pluginlib_tutorials/src/polygon_plugins.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nodelet_tutorial_math/src/plus.cpp b/nodelet_tutorial_math/src/plus.cpp index 16e73b9..99bc26b 100644 --- a/nodelet_tutorial_math/src/plus.cpp +++ b/nodelet_tutorial_math/src/plus.cpp @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/pluginlib_tutorials/src/polygon_loader.cpp b/pluginlib_tutorials/src/polygon_loader.cpp index 46d4137..c3f11bb 100644 --- a/pluginlib_tutorials/src/polygon_loader.cpp +++ b/pluginlib_tutorials/src/polygon_loader.cpp @@ -38,7 +38,7 @@ #include -#include +#include #include int main(int argc, char** argv) diff --git a/pluginlib_tutorials/src/polygon_plugins.cpp b/pluginlib_tutorials/src/polygon_plugins.cpp index 9ae346d..2006c35 100644 --- a/pluginlib_tutorials/src/polygon_plugins.cpp +++ b/pluginlib_tutorials/src/polygon_plugins.cpp @@ -35,7 +35,7 @@ * Author: Eitan Marder-Eppstein * Author: Isaac Saito *********************************************************************/ -#include +#include #include #include From ce62860d662f4836b5a49d6761e72943833890ac Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Fri, 23 Dec 2022 16:02:42 -0800 Subject: [PATCH 3/3] need ros.h now for log messages --- pluginlib_tutorials/src/polygon_loader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/pluginlib_tutorials/src/polygon_loader.cpp b/pluginlib_tutorials/src/polygon_loader.cpp index c3f11bb..bfe9f65 100644 --- a/pluginlib_tutorials/src/polygon_loader.cpp +++ b/pluginlib_tutorials/src/polygon_loader.cpp @@ -40,6 +40,7 @@ #include #include +#include int main(int argc, char** argv) {