Merge branch 'main' into fix/use_lanelet_extension_landmark

autowarefoundation · Dec 27, 2023 · 8666b8a · 8666b8a
2 parents 159c9b1 + bf55986
commit 8666b8a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/...clude/radar_fusion_to_detected_object.hpp → ...bject/radar_fusion_to_detected_object.hpp b/...clude/radar_fusion_to_detected_object.hpp → ...bject/radar_fusion_to_detected_object.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
-#define RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
+#ifndef RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
+#define RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
 
 #include "rclcpp/logger.hpp"
 #include "tier4_autoware_utils/geometry/boost_geometry.hpp"
@@ -115,4 +115,4 @@ class RadarFusionToDetectedObject
 };
 }  // namespace radar_fusion_to_detected_object
 
-#endif  // RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
+#endif  // RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_HPP_
diff --git a/...object_fusion_to_detected_object_node.hpp → .../radar_fusion_to_detected_object_node.hpp b/...object_fusion_to_detected_object_node.hpp → .../radar_fusion_to_detected_object_node.hpp
@@ -13,13 +13,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT__RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
-#define RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT__RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
+#ifndef RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
+#define RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
 
 #include "message_filters/subscriber.h"
 #include "message_filters/sync_policies/approximate_time.h"
 #include "message_filters/synchronizer.h"
-#include "radar_fusion_to_detected_object.hpp"
+#include "radar_fusion_to_detected_object/radar_fusion_to_detected_object.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 #include "autoware_auto_perception_msgs/msg/detected_objects.hpp"
@@ -89,4 +89,4 @@ class RadarObjectFusionToDetectedObjectNode : public rclcpp::Node
 
 }  // namespace radar_fusion_to_detected_object
 
-#endif  // RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT__RADAR_OBJECT_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
+#endif  // RADAR_FUSION_TO_DETECTED_OBJECT__RADAR_FUSION_TO_DETECTED_OBJECT_NODE_HPP_
diff --git a/perception/radar_fusion_to_detected_object/src/radar_fusion_to_detected_object.cpp b/perception/radar_fusion_to_detected_object/src/radar_fusion_to_detected_object.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "radar_fusion_to_detected_object.hpp"
+#include "radar_fusion_to_detected_object/radar_fusion_to_detected_object.hpp"
 
 #include <tier4_autoware_utils/geometry/geometry.hpp>
 #include <tier4_autoware_utils/math/normalization.hpp>

diff --git a/...dar_object_fusion_to_detected_object_node/radar_object_fusion_to_detected_object_node.cpp b/...dar_object_fusion_to_detected_object_node/radar_object_fusion_to_detected_object_node.cpp
@@ -13,8 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "radar_object_fusion_to_detected_object/radar_object_fusion_to_detected_object_node.hpp"
-
+#include "radar_fusion_to_detected_object/radar_fusion_to_detected_object_node.hpp"
 #include "rclcpp/rclcpp.hpp"
 
 #include <memory>