Skip to content

Commit e330527

Browse files
committed
Change registry insert to insert_or_assign to allow old weak_ptrs to be replaced
1 parent 7a6ace6 commit e330527

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

behaviortree_ros2/include/behaviortree_ros2/bt_action_node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ inline bool RosActionNode<T>::createClient(const std::string& action_name)
309309
if(it == registry.end() || it->second.expired())
310310
{
311311
client_instance_ = std::make_shared<ActionClientInstance>(node, action_name);
312-
registry.insert({ action_client_key_, client_instance_ });
312+
registry.insert_or_assign( action_client_key_, client_instance_ );
313313
}
314314
else
315315
{

behaviortree_ros2/include/behaviortree_ros2/bt_service_node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ inline bool RosServiceNode<T>::createClient(const std::string& service_name)
275275
if(it == registry.end() || it->second.expired())
276276
{
277277
srv_instance_ = std::make_shared<ServiceClientInstance>(node, service_name);
278-
registry.insert({ client_key, srv_instance_ });
278+
registry.insert_or_assign( client_key, srv_instance_ );
279279

280280
RCLCPP_INFO(logger(), "Node [%s] created service client [%s]", name().c_str(),
281281
service_name.c_str());

behaviortree_ros2/include/behaviortree_ros2/bt_topic_sub_node.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ inline bool RosTopicSubNode<T>::createSubscriber(const std::string& topic_name)
262262
if(it == registry.end() || it->second.expired())
263263
{
264264
sub_instance_ = std::make_shared<SubscriberInstance>(node, topic_name);
265-
registry.insert({ subscriber_key_, sub_instance_ });
265+
registry.insert_or_assign( subscriber_key_, sub_instance_ );
266266

267267
RCLCPP_INFO(logger(), "Node [%s] created Subscriber to topic [%s]", name().c_str(),
268268
topic_name.c_str());

0 commit comments

Comments
 (0)