Skip to content

Commit 1f80ed2

Browse files
committed
Apply fixes required for Clang to compile
1 parent 9707c89 commit 1f80ed2

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();
@@ -771,7 +774,7 @@ class IntraProcessManager
771774
{
772775
add_owned_msg_to_buffers<MessageT, Alloc, Deleter, ROSMessageType>(
773776
std::move(message), {subscription_id}, allocator);
774-
}
777+
}
775778

776779
/// Return true if the given rmw_gid_t matches any stored Publishers.
777780
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

@@ -515,7 +518,7 @@ class Client : public ClientBase
515518
// If there's not, we fall back into inter-process communication, since
516519
// the server might be available in another process or was configured to not use IPC.
517520
if (intra_process_server_available) {
518-
ipm->intra_process_action_send_goal_request<ActionT>(
521+
ipm->template intra_process_action_send_goal_request<ActionT>(
519522
ipc_action_client_id_,
520523
std::move(goal_request),
521524
callback);
@@ -828,7 +831,7 @@ class Client : public ClientBase
828831
// If there's not, we fall back into inter-process communication, since
829832
// the server might be available in another process or was configured to not use IPC.
830833
if (intra_process_server_available) {
831-
ipm->intra_process_action_send_result_request<ActionT>(
834+
ipm->template intra_process_action_send_result_request<ActionT>(
832835
ipc_action_client_id_,
833836
std::move(goal_result_request),
834837
callback);
@@ -884,7 +887,7 @@ class Client : public ClientBase
884887
// If there's not, we fall back into inter-process communication, since
885888
// the server might be available in another process or was configured to not use IPC.
886889
if (intra_process_server_available) {
887-
ipm->intra_process_action_send_cancel_request<ActionT>(
890+
ipm->template intra_process_action_send_cancel_request<ActionT>(
888891
ipc_action_client_id_,
889892
std::move(cancel_request),
890893
callback);

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

@@ -528,7 +531,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
528531
intra_process_action_client_id,
529532
std::hash<GoalUUID>()(uuid));
530533

531-
ipm->intra_process_action_send_goal_response<ActionT>(
534+
ipm->template intra_process_action_send_goal_response<ActionT>(
532535
intra_process_action_client_id,
533536
std::move(goal_response));
534537

@@ -597,7 +600,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
597600
std::move(status_msg));
598601
}
599602

600-
ipm->intra_process_action_send_cancel_response<ActionT>(
603+
ipm->template intra_process_action_send_cancel_response<ActionT>(
601604
intra_process_action_client_id,
602605
std::move(response));
603606
}
@@ -632,7 +635,7 @@ class Server : public ServerBase, public std::enable_shared_from_this<Server<Act
632635
}
633636

634637
auto typed_response = std::static_pointer_cast<ResultResponse>(result_response);
635-
ipm->intra_process_action_send_result_response<ActionT>(
638+
ipm->template intra_process_action_send_result_response<ActionT>(
636639
intra_process_action_client_id,
637640
std::move(typed_response));
638641
}

0 commit comments

Comments
 (0)