重複していたmulticast.hppをcrane_basicsパッケージで管理することで統一 (#663)

ibis-ssl · Dec 25, 2024 · e7c6f50 · e7c6f50
1 parent c024624
commit e7c6f50
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 107 deletions.
diff --git a/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/game_controller_component.hpp b/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/game_controller_component.hpp
@@ -17,12 +17,12 @@
 
 #include <robocup_ssl_msgs/ssl_gc_referee_message.pb.h>
 
+#include <crane_basics/multicast.hpp>
 #include <memory>
 #include <rclcpp/rclcpp.hpp>
 #include <robocup_ssl_msgs/msg/referee.hpp>
 #include <robocup_ssl_msgs/msg/team_info.hpp>
 
-#include "multicast.hpp"
 #include "visibility_control.h"
 
 namespace robocup_ssl_comm

diff --git a/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/multicast.hpp b/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/multicast.hpp
diff --git a/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/robot_status_component.hpp b/consai_ros2/robocup_ssl_comm/include/robocup_ssl_comm/robot_status_component.hpp
@@ -12,11 +12,11 @@
 #include <robocup_ssl_msgs/ssl_vision_geometry.pb.h>
 #include <robocup_ssl_msgs/ssl_vision_wrapper.pb.h>
 
+#include <crane_basics/multicast.hpp>
 #include <memory>
 #include <rclcpp/rclcpp.hpp>
 #include <robocup_ssl_msgs/msg/robots_status.hpp>
 
-#include "multicast.hpp"
 #include "visibility_control.h"
 
 namespace robocup_ssl_comm

diff --git a/consai_ros2/robocup_ssl_comm/package.xml b/consai_ros2/robocup_ssl_comm/package.xml
@@ -10,6 +10,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
 
   <depend>boost</depend>
+  <depend>crane_basics</depend>
   <depend>launch_ros</depend>
   <depend>rclcpp</depend>
   <depend>rclcpp_components</depend>

diff --git a/crane_world_model_publisher/include/crane_world_model_publisher/world_model_publisher.hpp b/crane_world_model_publisher/include/crane_world_model_publisher/world_model_publisher.hpp
@@ -51,13 +51,13 @@ extern "C" {
 #include <robocup_ssl_msgs/ssl_vision_wrapper.pb.h>
 
 #include <crane_basics/boost_geometry.hpp>
+#include <crane_basics/multicast.hpp>
 #include <crane_msg_wrappers/consai_visualizer_wrapper.hpp>
 #include <crane_msgs/msg/ball_info.hpp>
 #include <crane_msgs/msg/play_situation.hpp>
 #include <crane_msgs/msg/robot_feedback_array.hpp>
 #include <crane_msgs/msg/robot_info.hpp>
 #include <crane_msgs/msg/world_model.hpp>
-#include <crane_world_model_publisher/multicast.hpp>
 #include <crane_world_model_publisher/visualization_data_handler.hpp>
 #include <deque>
 #include <memory>

diff --git a/...crane_world_model_publisher/multicast.hpp → ...basics/include/crane_basics/multicast.hpp b/...crane_world_model_publisher/multicast.hpp → ...basics/include/crane_basics/multicast.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRANE_WORLD_MODEL_PUBLISHER__MULTICAST_HPP_
-#define CRANE_WORLD_MODEL_PUBLISHER__MULTICAST_HPP_
+#ifndef CRANE_BASICS__MULTICAST_HPP_
+#define CRANE_BASICS__MULTICAST_HPP_
 
 #include <arpa/inet.h>
 #include <ifaddrs.h>
@@ -100,4 +100,4 @@ class MulticastReceiver
 
 }  // namespace multicast
 
-#endif  // CRANE_WORLD_MODEL_PUBLISHER__MULTICAST_HPP_
+#endif  // CRANE_BASICS__MULTICAST_HPP_