Skip to content

Commit 43f28e6

Browse files
committed
build(behavior_path_external_request_lane_change_module): prefix package and namespace with autoware_
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent aa0c633 commit 43f28e6

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

planning/behavior_path_external_request_lane_change_module/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(behavior_path_external_request_lane_change_module)
2+
project(autoware_behavior_path_external_request_lane_change_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

planning/behavior_path_external_request_lane_change_module/include/behavior_path_external_request_lane_change_module/manager.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#include <memory>
2424
#include <string>
2525

26+
namespace autoware
27+
{
2628
namespace behavior_path_planner
2729
{
2830
class ExternalRequestLaneChangeRightModuleManager : public LaneChangeModuleManager
@@ -50,5 +52,6 @@ class ExternalRequestLaneChangeLeftModuleManager : public LaneChangeModuleManage
5052
std::unique_ptr<SceneModuleInterface> createNewSceneModuleInstance() override;
5153
};
5254
} // namespace behavior_path_planner
55+
} // namespace autoware
5356

5457
#endif // BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_

planning/behavior_path_external_request_lane_change_module/include/behavior_path_external_request_lane_change_module/scene.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
#include <memory>
2121

22+
namespace autoware
23+
{
2224
namespace behavior_path_planner
2325
{
2426
class ExternalRequestLaneChange : public NormalLaneChange
@@ -34,5 +36,6 @@ class ExternalRequestLaneChange : public NormalLaneChange
3436
~ExternalRequestLaneChange() override = default;
3537
};
3638
} // namespace behavior_path_planner
39+
} // namespace autoware
3740

3841
#endif // BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_

planning/behavior_path_external_request_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>behavior_path_external_request_lane_change_module</name>
4+
<name>autoware_behavior_path_external_request_lane_change_module</name>
55
<version>0.1.0</version>
66
<description>The behavior_path_external_request_lane_change_module package</description>
77

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<library path="behavior_path_external_request_lane_change_module">
2-
<class type="behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
3-
<class type="behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
2+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
3+
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
44
</library>

planning/behavior_path_external_request_lane_change_module/src/manager.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ ExternalRequestLaneChangeLeftModuleManager::createNewSceneModuleInstance()
4242

4343
#include <pluginlib/class_list_macros.hpp>
4444
PLUGINLIB_EXPORT_CLASS(
45-
behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
46-
behavior_path_planner::SceneModuleManagerInterface)
45+
autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
46+
autoware::behavior_path_planner::SceneModuleManagerInterface)
4747
PLUGINLIB_EXPORT_CLASS(
48-
behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
49-
behavior_path_planner::SceneModuleManagerInterface)
48+
autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
49+
autoware::behavior_path_planner::SceneModuleManagerInterface)

planning/behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <cmath>
2323
#include <vector>
2424

25-
using behavior_path_planner::BehaviorPathPlannerNode;
25+
using autoware::behavior_path_planner::BehaviorPathPlannerNode;
2626
using planning_test_utils::PlanningInterfaceTestManager;
2727

2828
std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
@@ -51,8 +51,8 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
5151
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
5252

5353
std::vector<std::string> module_names;
54-
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
55-
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");
54+
module_names.emplace_back("autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
55+
module_names.emplace_back("autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");
5656

5757
std::vector<rclcpp::Parameter> params;
5858
params.emplace_back("launch_modules", module_names);

0 commit comments

Comments
 (0)