Skip to content

Commit f880a52

Browse files
committed
Use spin_until_complete instead of deprecated spin_until_future_complete
Signed-off-by: Hubert Liberacki <hliberacki@gmail.com>
1 parent bd49f4b commit f880a52

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎demo_nodes_cpp/src/parameters/list_parameters_async.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ int main(int argc, char ** argv)
5959
rclcpp::Parameter("foobar", true),
6060
});
6161
// Wait for the result.
62-
rclcpp::spin_until_future_complete(node, results);
62+
rclcpp::spin_until_complete(node, results);
6363

6464
RCLCPP_INFO(node->get_logger(), "Listing parameters...");
6565
// List the details of a few parameters up to a namespace depth of 10.
6666
auto parameter_list_future = parameters_client->list_parameters({"foo", "bar"}, 10);
6767

68-
if (rclcpp::spin_until_future_complete(node, parameter_list_future) !=
68+
if (rclcpp::spin_until_complete(node, parameter_list_future) !=
6969
rclcpp::FutureReturnCode::SUCCESS)
7070
{
7171
RCLCPP_ERROR(node->get_logger(), "service call failed, exiting tutorial.");

‎demo_nodes_cpp/src/parameters/parameter_events.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ int main(int argc, char ** argv)
122122

123123
// TODO(wjwwood): Create and use delete_parameter
124124

125-
rclcpp::spin_until_future_complete(node, events_received_future.share());
125+
rclcpp::spin_until_complete(node, events_received_future.share());
126126
rclcpp::shutdown();
127127

128128
return 0;

‎demo_nodes_cpp/src/parameters/set_and_get_parameters_async.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
5858
rclcpp::Parameter("toto", std::vector<uint8_t>({0xff, 0x7f})),
5959
});
6060
// Wait for the results.
61-
if (rclcpp::spin_until_future_complete(node, results) !=
61+
if (rclcpp::spin_until_complete(node, results) !=
6262
rclcpp::FutureReturnCode::SUCCESS)
6363
{
6464
RCLCPP_ERROR(node->get_logger(), "set_parameters service call failed. Exiting tutorial.");
@@ -73,7 +73,7 @@ int main(int argc, char ** argv)
7373

7474
// Get a few of the parameters just set.
7575
auto parameters = parameters_client->get_parameters({"foo", "baz", "foobarbaz", "toto"});
76-
if (rclcpp::spin_until_future_complete(node, parameters) !=
76+
if (rclcpp::spin_until_complete(node, parameters) !=
7777
rclcpp::FutureReturnCode::SUCCESS)
7878
{
7979
RCLCPP_ERROR(node->get_logger(), "get_parameters service call failed. Exiting tutorial.");

‎demo_nodes_cpp/src/services/add_two_ints_client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ example_interfaces::srv::AddTwoInts::Response::SharedPtr send_request(
2929
{
3030
auto result = client->async_send_request(request);
3131
// Wait for the result.
32-
if (rclcpp::spin_until_future_complete(node, result) ==
32+
if (rclcpp::spin_until_complete(node, result) ==
3333
rclcpp::FutureReturnCode::SUCCESS)
3434
{
3535
return result.get();

‎demo_nodes_py/demo_nodes_py/services/add_two_ints_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def main(args=None):
2929
req.a = 2
3030
req.b = 3
3131
future = cli.call_async(req)
32-
rclpy.spin_until_future_complete(node, future)
32+
rclpy.spin_until_complete(node, future)
3333
if future.result() is not None:
3434
node.get_logger().info('Result of add_two_ints: %d' % future.result().sum)
3535
else:

‎lifecycle/src/lifecycle_service_client.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ int main(int argc, char ** argv)
334334
std::launch::async,
335335
std::bind(wake_executor, script, std::ref(exe)));
336336

337-
exe.spin_until_future_complete(script);
337+
exe.spin_until_complete(script);
338338

339339
rclcpp::shutdown();
340340

0 commit comments

Comments
 (0)