Merge branch 'obese-devel-ros-comm-boost-bind-api-migration' into obe…

…se-devel Closes #3
ros-o · Aug 27, 2024 · 445ea8a · 445ea8a
2 parents d5a1b6d + 433cc88
commit 445ea8a
Show file tree

Hide file tree

Showing 25 changed files with 26 additions and 21 deletions.
diff --git a/clients/roscpp/include/ros/node_handle.h b/clients/roscpp/include/ros/node_handle.h
@@ -47,7 +47,7 @@
 #include "ros/init.h"
 #include "common.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <xmlrpcpp/XmlRpcValue.h>
 

diff --git a/clients/roscpp/include/ros/publisher.h b/clients/roscpp/include/ros/publisher.h
@@ -32,7 +32,7 @@
 #include "ros/common.h"
 #include "ros/message.h"
 #include "ros/serialization.h"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/mutex.hpp>
 
 namespace ros

diff --git a/clients/roscpp/include/ros/timer_manager.h b/clients/roscpp/include/ros/timer_manager.h
@@ -40,6 +40,8 @@
 #include "ros/assert.h"
 #include "ros/callback_queue_interface.h"
 
+#include <boost/bind/bind.hpp>
+
 #include <vector>
 #include <list>
 

diff --git a/clients/roscpp/include/ros/topic_manager.h b/clients/roscpp/include/ros/topic_manager.h
@@ -35,6 +35,7 @@
 
 #include "xmlrpcpp/XmlRpcValue.h"
 
+#include <boost/bind/bind.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 

diff --git a/clients/roscpp/src/libros/connection.cpp b/clients/roscpp/src/libros/connection.cpp
@@ -39,7 +39,7 @@
 #include <ros/assert.h>
 
 #include <boost/shared_array.hpp>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ros
 {

diff --git a/clients/roscpp/src/libros/connection_manager.cpp b/clients/roscpp/src/libros/connection_manager.cpp
@@ -35,6 +35,7 @@
 #include "ros/file_log.h"
 #include "ros/network.h"
 
+#include <boost/bind/bind.hpp>
 #include <ros/assert.h>
 
 namespace ros

diff --git a/clients/roscpp/src/libros/intraprocess_publisher_link.cpp b/clients/roscpp/src/libros/intraprocess_publisher_link.cpp
@@ -42,7 +42,7 @@
 #include "ros/connection_manager.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <sstream>
 

diff --git a/clients/roscpp/src/libros/intraprocess_subscriber_link.cpp b/clients/roscpp/src/libros/intraprocess_subscriber_link.cpp
@@ -37,7 +37,7 @@
 #include "ros/topic_manager.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ros
 {

diff --git a/clients/roscpp/src/libros/poll_set.cpp b/clients/roscpp/src/libros/poll_set.cpp
@@ -39,7 +39,7 @@
 
 #include <ros/assert.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <fcntl.h>
 

diff --git a/clients/roscpp/src/libros/publisher_link.cpp b/clients/roscpp/src/libros/publisher_link.cpp
@@ -41,7 +41,7 @@
 #include "ros/connection_manager.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <sstream>
 

diff --git a/clients/roscpp/src/libros/service_client_link.cpp b/clients/roscpp/src/libros/service_client_link.cpp
@@ -41,7 +41,7 @@
 #include "ros/this_node.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ros
 {

diff --git a/clients/roscpp/src/libros/service_publication.cpp b/clients/roscpp/src/libros/service_publication.cpp
@@ -37,7 +37,7 @@
 #include "ros/connection.h"
 #include "ros/callback_queue_interface.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <std_msgs/String.h>
 

diff --git a/clients/roscpp/src/libros/service_server_link.cpp b/clients/roscpp/src/libros/service_server_link.cpp
@@ -40,7 +40,7 @@
 #include "ros/this_node.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <sstream>
 

diff --git a/clients/roscpp/src/libros/subscriber_link.cpp b/clients/roscpp/src/libros/subscriber_link.cpp
@@ -28,7 +28,7 @@
 #include "ros/subscriber_link.h"
 #include "ros/publication.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ros
 {

diff --git a/clients/roscpp/src/libros/topic_manager.cpp b/clients/roscpp/src/libros/topic_manager.cpp
@@ -43,6 +43,7 @@
 
 #include "xmlrpcpp/XmlRpc.h"
 
+#include <boost/bind/bind.hpp>
 #include <ros/console.h>
 
 using namespace XmlRpc; // A battle to be fought later

diff --git a/clients/roscpp/src/libros/transport/transport_tcp.cpp b/clients/roscpp/src/libros/transport/transport_tcp.cpp
@@ -39,7 +39,7 @@
 #include "ros/file_log.h"
 #include <ros/assert.h>
 #include <sstream>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <fcntl.h>
 #include <errno.h>
 #ifndef _WIN32

diff --git a/clients/roscpp/src/libros/transport/transport_udp.cpp b/clients/roscpp/src/libros/transport/transport_udp.cpp
@@ -37,7 +37,7 @@
 #include "ros/file_log.h"
 
 #include <ros/assert.h>
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #ifndef _WIN32
   #include <sys/socket.h>  // explicit include required for FreeBSD
 #endif

diff --git a/clients/roscpp/src/libros/transport_publisher_link.cpp b/clients/roscpp/src/libros/transport_publisher_link.cpp
@@ -48,7 +48,7 @@
 #include "ros/callback_queue.h"
 #include "ros/internal_timer_manager.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <sstream>
 

diff --git a/clients/roscpp/src/libros/transport_subscriber_link.cpp b/clients/roscpp/src/libros/transport_subscriber_link.cpp
@@ -36,7 +36,7 @@
 #include "ros/topic_manager.h"
 #include "ros/file_log.h"
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 namespace ros
 {

diff --git a/utilities/message_filters/include/message_filters/signal1.h b/utilities/message_filters/include/message_filters/signal1.h
@@ -41,7 +41,7 @@
 #include <ros/message_event.h>
 #include <ros/parameter_adapter.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/mutex.hpp>
 
 namespace message_filters

diff --git a/utilities/message_filters/include/message_filters/signal9.h b/utilities/message_filters/include/message_filters/signal9.h
@@ -42,7 +42,7 @@
 #include <ros/message_event.h>
 #include <ros/parameter_adapter.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/thread/mutex.hpp>
 
 namespace message_filters

diff --git a/utilities/message_filters/include/message_filters/simple_filter.h b/utilities/message_filters/include/message_filters/simple_filter.h
@@ -42,7 +42,7 @@
 #include <ros/message_event.h>
 #include <ros/subscription_callback_helper.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <string>
 

diff --git a/utilities/message_filters/include/message_filters/sync_policies/approximate_time.h b/utilities/message_filters/include/message_filters/sync_policies/approximate_time.h
@@ -45,7 +45,7 @@
 #include <boost/function.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/mpl/or.hpp>

diff --git a/utilities/message_filters/include/message_filters/sync_policies/exact_time.h b/utilities/message_filters/include/message_filters/sync_policies/exact_time.h
@@ -45,7 +45,7 @@
 #include <boost/function.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/mpl/or.hpp>

diff --git a/utilities/message_filters/include/message_filters/synchronizer.h b/utilities/message_filters/include/message_filters/synchronizer.h
@@ -40,7 +40,7 @@
 #include <boost/function.hpp>
 #include <boost/thread/mutex.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/mpl/or.hpp>