Skip to content

Commit 8aea1a8

Browse files
doisygGuillaume Doisy
andauthored
default empty constructor (#5518)
Signed-off-by: Guillaume Doisy <[email protected]> Co-authored-by: Guillaume Doisy <[email protected]>
1 parent ab4aaf8 commit 8aea1a8

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ class BtActionServer
5353
const std::string & action_name,
5454
const std::vector<std::string> & plugin_lib_names,
5555
const std::string & default_bt_xml_filename,
56-
const std::vector<std::string> & search_directories,
5756
OnGoalReceivedCallback on_goal_received_callback,
5857
OnLoopCallback on_loop_callback,
5958
OnPreemptCallback on_preempt_callback,
60-
OnCompletionCallback on_completion_callback);
59+
OnCompletionCallback on_completion_callback,
60+
const std::vector<std::string> & search_directories = std::vector<std::string>{});
6161

6262
/**
6363
* @brief A destructor for nav2_behavior_tree::BtActionServer class

nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ BtActionServer<ActionT, NodeT>::BtActionServer(
3939
const std::string & action_name,
4040
const std::vector<std::string> & plugin_lib_names,
4141
const std::string & default_bt_xml_filename,
42-
const std::vector<std::string> & search_directories,
4342
OnGoalReceivedCallback on_goal_received_callback,
4443
OnLoopCallback on_loop_callback,
4544
OnPreemptCallback on_preempt_callback,
46-
OnCompletionCallback on_completion_callback)
45+
OnCompletionCallback on_completion_callback,
46+
const std::vector<std::string> & search_directories)
4747
: action_name_(action_name),
4848
default_bt_xml_filename_(default_bt_xml_filename),
4949
search_directories_(search_directories),

nav2_core/include/nav2_core/behavior_tree_navigator.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,13 @@ class BehaviorTreeNavigator : public NavigatorBase
214214
getName(),
215215
plugin_lib_names,
216216
default_bt_xml_filename,
217-
search_directories,
218217
std::bind(&BehaviorTreeNavigator::onGoalReceived, this, std::placeholders::_1),
219218
std::bind(&BehaviorTreeNavigator::onLoop, this),
220219
std::bind(&BehaviorTreeNavigator::onPreempt, this, std::placeholders::_1),
221220
std::bind(
222221
&BehaviorTreeNavigator::onCompletion, this,
223-
std::placeholders::_1, std::placeholders::_2));
222+
std::placeholders::_1, std::placeholders::_2),
223+
search_directories);
224224

225225
bool ok = true;
226226
if (!bt_action_server_->on_configure()) {

0 commit comments

Comments
 (0)