From 50b7659679c9d6aff577d55eef5253ee8a0771be Mon Sep 17 00:00:00 2001 From: Takayuki Murooka Date: Mon, 17 Jun 2024 17:12:46 +0900 Subject: [PATCH] feat(surround_obstacle_checker): remove include directory (#7507) * feat(surround_obstacle_checker): remove include directory Signed-off-by: Takayuki Murooka * fix Signed-off-by: Takayuki Murooka * fix Signed-off-by: Takayuki Murooka --------- Signed-off-by: Takayuki Murooka --- .../src/debug_marker.cpp | 3 ++- .../debug_marker.hpp | 6 +++--- planning/autoware_surround_obstacle_checker/src/node.cpp | 2 +- .../autoware_surround_obstacle_checker => src}/node.hpp | 8 ++++---- 4 files changed, 10 insertions(+), 9 deletions(-) rename planning/autoware_surround_obstacle_checker/{include/autoware_surround_obstacle_checker => src}/debug_marker.hpp (95%) rename planning/autoware_surround_obstacle_checker/{include/autoware_surround_obstacle_checker => src}/node.hpp (95%) diff --git a/planning/autoware_surround_obstacle_checker/src/debug_marker.cpp b/planning/autoware_surround_obstacle_checker/src/debug_marker.cpp index b676673128269..718e72845ade3 100644 --- a/planning/autoware_surround_obstacle_checker/src/debug_marker.cpp +++ b/planning/autoware_surround_obstacle_checker/src/debug_marker.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_surround_obstacle_checker/debug_marker.hpp" +#include "debug_marker.hpp" #include #include @@ -23,6 +23,7 @@ #include #endif +#include #include namespace autoware::surround_obstacle_checker diff --git a/planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/debug_marker.hpp b/planning/autoware_surround_obstacle_checker/src/debug_marker.hpp similarity index 95% rename from planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/debug_marker.hpp rename to planning/autoware_surround_obstacle_checker/src/debug_marker.hpp index c7ec2e5b564e6..058bf964e7dc4 100644 --- a/planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/debug_marker.hpp +++ b/planning/autoware_surround_obstacle_checker/src/debug_marker.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_SURROUND_OBSTACLE_CHECKER__DEBUG_MARKER_HPP_ -#define AUTOWARE_SURROUND_OBSTACLE_CHECKER__DEBUG_MARKER_HPP_ +#ifndef DEBUG_MARKER_HPP_ +#define DEBUG_MARKER_HPP_ #include #include @@ -99,4 +99,4 @@ class SurroundObstacleCheckerDebugNode rclcpp::Clock::SharedPtr clock_; }; } // namespace autoware::surround_obstacle_checker -#endif // AUTOWARE_SURROUND_OBSTACLE_CHECKER__DEBUG_MARKER_HPP_ +#endif // DEBUG_MARKER_HPP_ diff --git a/planning/autoware_surround_obstacle_checker/src/node.cpp b/planning/autoware_surround_obstacle_checker/src/node.cpp index 8d6279eeefb22..5375b1f736fd3 100644 --- a/planning/autoware_surround_obstacle_checker/src/node.cpp +++ b/planning/autoware_surround_obstacle_checker/src/node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_surround_obstacle_checker/node.hpp" +#include "node.hpp" #include #include diff --git a/planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/node.hpp b/planning/autoware_surround_obstacle_checker/src/node.hpp similarity index 95% rename from planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/node.hpp rename to planning/autoware_surround_obstacle_checker/src/node.hpp index 6c81be01be6d0..b28d0fa6fff70 100644 --- a/planning/autoware_surround_obstacle_checker/include/autoware_surround_obstacle_checker/node.hpp +++ b/planning/autoware_surround_obstacle_checker/src/node.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_SURROUND_OBSTACLE_CHECKER__NODE_HPP_ -#define AUTOWARE_SURROUND_OBSTACLE_CHECKER__NODE_HPP_ +#ifndef NODE_HPP_ +#define NODE_HPP_ -#include "autoware_surround_obstacle_checker/debug_marker.hpp" +#include "debug_marker.hpp" #include "tier4_autoware_utils/ros/logger_level_configure.hpp" #include "tier4_autoware_utils/ros/polling_subscriber.hpp" @@ -151,4 +151,4 @@ class SurroundObstacleCheckerNode : public rclcpp::Node }; } // namespace autoware::surround_obstacle_checker -#endif // AUTOWARE_SURROUND_OBSTACLE_CHECKER__NODE_HPP_ +#endif // NODE_HPP_