Skip to content

Commit 43ca625

Browse files
committed
Apply fixes required for Clang to compile
1 parent 4b41d07 commit 43ca625

File tree

4 files changed

+21
-9
lines changed

4 files changed

+21
-9
lines changed

rclcpp/include/rclcpp/client.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// This file has been copied and modified by iRobot.
16+
// Copyright 2022 iRobot Corporation. All Rights Reserved.
17+
1518
#ifndef RCLCPP__CLIENT_HPP_
1619
#define RCLCPP__CLIENT_HPP_
1720

@@ -863,7 +866,7 @@ class Client : public ClientBase
863866
// the server might be available in another process or was configured to not use IPC.
864867
if (intra_process_server_available) {
865868
// Send intra-process request
866-
ipm->send_intra_process_client_request<ServiceT>(
869+
ipm->template send_intra_process_client_request<ServiceT>(
867870
intra_process_client_id_,
868871
std::make_pair(std::move(request), std::move(value)));
869872
return ipc_sequence_number_++;

rclcpp/include/rclcpp/experimental/intra_process_manager.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// This file has been copied and modified by iRobot.
16+
// Copyright 2024 iRobot Corporation. All Rights Reserved.
17+
1518
#ifndef RCLCPP__EXPERIMENTAL__INTRA_PROCESS_MANAGER_HPP_
1619
#define RCLCPP__EXPERIMENTAL__INTRA_PROCESS_MANAGER_HPP_
1720

@@ -405,7 +408,7 @@ class IntraProcessManager
405408
"Intra-process service gone out of scope. "
406409
"Do inter-process requests.\n"
407410
"Client service name: " + std::string(cli->get_service_name());
408-
RCLCPP_WARN(rclcpp::get_logger("rclcpp"), warning_msg.c_str());
411+
RCLCPP_WARN(rclcpp::get_logger("rclcpp"), "%s", warning_msg.c_str());
409412
return;
410413
}
411414
auto service_intra_process_base = service_it->second.lock();
@@ -762,7 +765,7 @@ class IntraProcessManager
762765
{
763766
add_owned_msg_to_buffers<MessageT, Alloc, Deleter, ROSMessageType>(
764767
std::move(message), {subscription_id}, allocator);
765-
}
768+
}
766769

767770
/// Return true if the given rmw_gid_t matches any stored Publishers.
768771
RCLCPP_PUBLIC

rclcpp_action/include/rclcpp_action/client.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// This file has been copied and modified by iRobot.
16+
// Copyright 2024 iRobot Corporation. All Rights Reserved.
17+
1518
#ifndef RCLCPP_ACTION__CLIENT_HPP_
1619
#define RCLCPP_ACTION__CLIENT_HPP_
1720

@@ -516,7 +519,7 @@ class Client : public ClientBase
516519
ipc_action_client_->store_goal_response_callback(
517520
hashed_guuid, goal_response_callback);
518521

519-
intra_process_send_done = ipm->intra_process_action_send_goal_request<ActionT>(
522+
intra_process_send_done = ipm->template intra_process_action_send_goal_request<ActionT>(
520523
ipc_action_client_id_,
521524
std::move(goal_request),
522525
hashed_guuid);
@@ -838,7 +841,7 @@ class Client : public ClientBase
838841
ipc_action_client_->store_result_response_callback(
839842
hashed_guuid, result_response_callback);
840843

841-
intra_process_send_done = ipm->intra_process_action_send_result_request<ActionT>(
844+
intra_process_send_done = ipm->template intra_process_action_send_result_request<ActionT>(
842845
ipc_action_client_id_,
843846
std::move(goal_result_request));
844847
}
@@ -894,7 +897,7 @@ class Client : public ClientBase
894897
ipc_action_client_->store_cancel_goal_callback(
895898
hashed_guuid, cancel_goal_callback);
896899

897-
intra_process_send_done = ipm->intra_process_action_send_cancel_request<ActionT>(
900+
intra_process_send_done = ipm->template intra_process_action_send_cancel_request<ActionT>(
898901
ipc_action_client_id_,
899902
std::move(cancel_request));
900903
}

rclcpp_action/include/rclcpp_action/server.hpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
// This file has been copied and modified by iRobot.
16+
// Copyright 2024 iRobot Corporation. All Rights Reserved.
17+
1518
#ifndef RCLCPP_ACTION__SERVER_HPP_
1619
#define RCLCPP_ACTION__SERVER_HPP_
1720

@@ -512,7 +515,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
512515

513516
auto ipm = lock_intra_process_manager();
514517

515-
ipm->intra_process_action_send_goal_response<ActionT>(
518+
ipm->template intra_process_action_send_goal_response<ActionT>(
516519
intra_process_action_client_id,
517520
std::move(goal_response),
518521
std::hash<GoalUUID>()(uuid));
@@ -576,7 +579,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
576579

577580
GoalUUID uuid = request->goal_info.goal_id.uuid;
578581

579-
ipm->intra_process_action_send_cancel_response<ActionT>(
582+
ipm->template intra_process_action_send_cancel_response<ActionT>(
580583
intra_process_action_client_id,
581584
std::move(response),
582585
std::hash<GoalUUID>()(uuid));
@@ -615,7 +618,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
615618
// Send the result now
616619
auto ipm = lock_intra_process_manager();
617620

618-
ipm->intra_process_action_send_result_response<ActionT>(
621+
ipm->template intra_process_action_send_result_response<ActionT>(
619622
intra_process_action_client_id,
620623
std::move(result_response),
621624
hashed_uuid);

0 commit comments

Comments
 (0)