From 967cb977b2806898f02b99ec5ee558eb632ac6e2 Mon Sep 17 00:00:00 2001
From: Esteve Fernandez <esteve.fernandez@tier4.jp>
Date: Tue, 12 Dec 2023 15:52:08 +0100
Subject: [PATCH] fix(detected_object_validation): use namespaces to avoid
 concflicts

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
---
 .../detected_object_filter/object_lanelet_filter.hpp   |  9 +++++++++
 .../detected_object_filter/object_position_filter.hpp  |  9 +++++++++
 .../obstacle_pointcloud_based_validator/debugger.hpp   |  9 +++++++++
 .../obstacle_pointcloud_based_validator.hpp            | 10 ++++++++++
 .../occupancy_grid_based_validator.hpp                 |  9 +++++++++
 .../include/detected_object_validation/utils/utils.hpp |  9 +++++++++
 6 files changed, 55 insertions(+)

diff --git a/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_lanelet_filter.hpp b/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_lanelet_filter.hpp
index 4331b5c19d3f1..178a086146f2c 100644
--- a/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_lanelet_filter.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_lanelet_filter.hpp
@@ -29,6 +29,12 @@
 
 #include <string>
 
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace object_lanelet_filter
 {
 using tier4_autoware_utils::LinearRing2d;
@@ -68,5 +74,8 @@ class ObjectLaneletFilterNode : public rclcpp::Node
 };
 
 }  // namespace object_lanelet_filter
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_LANELET_FILTER_HPP_
diff --git a/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_position_filter.hpp b/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_position_filter.hpp
index be25eb6a353e6..596e9d44b7fee 100644
--- a/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_position_filter.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/detected_object_filter/object_position_filter.hpp
@@ -28,6 +28,12 @@
 
 #include <string>
 
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace object_position_filter
 {
 
@@ -54,5 +60,8 @@ class ObjectPositionFilterNode : public rclcpp::Node
 };
 
 }  // namespace object_position_filter
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__DETECTED_OBJECT_FILTER__OBJECT_POSITION_FILTER_HPP_
diff --git a/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp b/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp
index 8f5fa054090f5..827344e9a5e38 100644
--- a/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/debugger.hpp
@@ -27,6 +27,12 @@
 #include <memory>
 #include <vector>
 
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace obstacle_pointcloud_based_validator
 {
 class Debugger
@@ -112,5 +118,8 @@ class Debugger
   }
 };
 }  // namespace obstacle_pointcloud_based_validator
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__DEBUGGER_HPP_
diff --git a/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp b/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp
index e5ae2d27b979d..66237323e2d6c 100644
--- a/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/obstacle_pointcloud_based_validator/obstacle_pointcloud_based_validator.hpp
@@ -38,6 +38,13 @@
 #include <memory>
 #include <optional>
 #include <vector>
+
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace obstacle_pointcloud_based_validator
 {
 
@@ -151,5 +158,8 @@ class ObstaclePointCloudBasedValidator : public rclcpp::Node
     const sensor_msgs::msg::PointCloud2::ConstSharedPtr & input_obstacle_pointcloud);
 };
 }  // namespace obstacle_pointcloud_based_validator
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__OBSTACLE_POINTCLOUD_BASED_VALIDATOR__OBSTACLE_POINTCLOUD_BASED_VALIDATOR_HPP_
diff --git a/perception/detected_object_validation/include/detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp b/perception/detected_object_validation/include/detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp
index 5fd866d09e725..25a556e4536ff 100644
--- a/perception/detected_object_validation/include/detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/occupancy_grid_based_validator/occupancy_grid_based_validator.hpp
@@ -29,6 +29,12 @@
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
 
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace occupancy_grid_based_validator
 {
 class OccupancyGridBasedValidator : public rclcpp::Node
@@ -67,5 +73,8 @@ class OccupancyGridBasedValidator : public rclcpp::Node
     const autoware_auto_perception_msgs::msg::DetectedObjects & objects, const cv::Mat & occ_grid);
 };
 }  // namespace occupancy_grid_based_validator
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__OCCUPANCY_GRID_BASED_VALIDATOR__OCCUPANCY_GRID_BASED_VALIDATOR_HPP_
diff --git a/perception/detected_object_validation/include/detected_object_validation/utils/utils.hpp b/perception/detected_object_validation/include/detected_object_validation/utils/utils.hpp
index 2c46e1b9dd110..f174c7339ae3b 100644
--- a/perception/detected_object_validation/include/detected_object_validation/utils/utils.hpp
+++ b/perception/detected_object_validation/include/detected_object_validation/utils/utils.hpp
@@ -17,6 +17,12 @@
 
 #include <cstdint>
 
+namespace autoware
+{
+namespace perception
+{
+namespace detected_object_validation
+{
 namespace utils
 {
 struct FilterTargetLabel
@@ -32,5 +38,8 @@ struct FilterTargetLabel
   bool isTarget(const uint8_t label) const;
 };  // struct FilterTargetLabel
 }  // namespace utils
+}  // namespace detected_object_validation
+}  // namespace perception
+}  // namespace autoware
 
 #endif  // DETECTED_OBJECT_VALIDATION__UTILS__UTILS_HPP_