build(detection_by_tracker): move utils.hpp file to the detection_by_…

…tracker folder and namespace to avoid conflicts (autowarefoundation#5837) * build(detection_by_tracker): move utils.hpp file to the detection_by_tracker folder and namespace to avoid conflicts Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> * style(pre-commit): autofix --------- Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Interplai · May 26, 2024 · 12234b9 · 12234b9
1 parent 705ab9e
commit 12234b9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/perception/detection_by_tracker/include/detection_by_tracker/detection_by_tracker_core.hpp b/perception/detection_by_tracker/include/detection_by_tracker/detection_by_tracker_core.hpp
@@ -16,6 +16,7 @@
 #define DETECTION_BY_TRACKER__DETECTION_BY_TRACKER_CORE_HPP_
 
 #include "detection_by_tracker/debugger.hpp"
+#include "detection_by_tracker/utils.hpp"
 
 #include <euclidean_cluster/euclidean_cluster.hpp>
 #include <euclidean_cluster/utils.hpp>
@@ -39,8 +40,6 @@
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
 #endif
 
-#include "utils/utils.hpp"
-
 #include <tf2_ros/buffer.h>
 #include <tf2_ros/transform_listener.h>
 
@@ -82,7 +81,7 @@ class DetectionByTracker : public rclcpp::Node
   std::map<uint8_t, int> max_search_distance_for_merger_;
   std::map<uint8_t, int> max_search_distance_for_divider_;
 
-  utils::TrackerIgnoreLabel tracker_ignore_;
+  detection_by_tracker::utils::TrackerIgnoreLabel tracker_ignore_;
 
   void setMaxSearchRange();
 

diff --git a/...ection_by_tracker/include/utils/utils.hpp → ...er/include/detection_by_tracker/utils.hpp b/...ection_by_tracker/include/utils/utils.hpp → ...er/include/detection_by_tracker/utils.hpp
@@ -12,11 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS__UTILS_HPP_
-#define UTILS__UTILS_HPP_
+#ifndef DETECTION_BY_TRACKER__UTILS_HPP_
+#define DETECTION_BY_TRACKER__UTILS_HPP_
 
 #include <cstdint>
 
+namespace detection_by_tracker
+{
 namespace utils
 {
 struct TrackerIgnoreLabel
@@ -32,5 +34,6 @@ struct TrackerIgnoreLabel
   bool isIgnore(const uint8_t label) const;
 };  // struct TrackerIgnoreLabel
 }  // namespace utils
+}  // namespace detection_by_tracker
 
-#endif  // UTILS__UTILS_HPP_
+#endif  // DETECTION_BY_TRACKER__UTILS_HPP_
diff --git a/perception/detection_by_tracker/src/utils.cpp b/perception/detection_by_tracker/src/utils.cpp
@@ -12,10 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/utils.hpp"
+#include "detection_by_tracker/utils.hpp"
 
 #include <autoware_auto_perception_msgs/msg/object_classification.hpp>
 
+namespace detection_by_tracker
+{
 namespace utils
 {
 using Label = autoware_auto_perception_msgs::msg::ObjectClassification;
@@ -28,3 +30,4 @@ bool TrackerIgnoreLabel::isIgnore(const uint8_t label) const
          (label == Label::BICYCLE && BICYCLE) || (label == Label::PEDESTRIAN && PEDESTRIAN);
 }
 }  // namespace utils
+}  // namespace detection_by_tracker