Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename rosidl_generator_c namespace to rosidl_runtime_c #616

Merged
merged 1 commit into from
Apr 11, 2020
Merged

rename rosidl_generator_c namespace to rosidl_runtime_c #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions rcl/include/rcl/client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C"
{
#endif

#include "rosidl_generator_c/service_type_support_struct.h"
#include "rosidl_runtime_c/service_type_support_struct.h"

#include "rcl/macros.h"
#include "rcl/node.h"
Expand Down Expand Up @@ -75,7 +75,7 @@ rcl_get_zero_initialized_client(void);
* For C, a macro can be used (for example `example_interfaces/AddTwoInts`):
*
* ```c
* #include <rosidl_generator_c/service_type_support_struct.h>
* #include <rosidl_runtime_c/service_type_support_struct.h>
* #include <example_interfaces/srv/add_two_ints.h>
*
* const rosidl_service_type_support_t * ts =
Expand Down Expand Up @@ -109,7 +109,7 @@ rcl_get_zero_initialized_client(void);
*
* ```c
* #include <rcl/rcl.h>
* #include <rosidl_generator_c/service_type_support_struct.h>
* #include <rosidl_runtime_c/service_type_support_struct.h>
* #include <example_interfaces/srv/add_two_ints.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
2 changes: 1 addition & 1 deletion rcl/include/rcl/graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern "C"

#include "rcutils/types.h"

#include "rosidl_generator_c/service_type_support_struct.h"
#include "rosidl_runtime_c/service_type_support_struct.h"

#include "rcl/macros.h"
#include "rcl/client.h"
Expand Down
6 changes: 3 additions & 3 deletions rcl/include/rcl/publisher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C"
{
#endif

#include "rosidl_generator_c/message_type_support_struct.h"
#include "rosidl_runtime_c/message_type_support_struct.h"

#include "rcl/macros.h"
#include "rcl/node.h"
Expand Down Expand Up @@ -74,7 +74,7 @@ rcl_get_zero_initialized_publisher(void);
* For C, a macro can be used (for example `std_msgs/String`):
*
* ```c
* #include <rosidl_generator_c/message_type_support_struct.h>
* #include <rosidl_runtime_c/message_type_support_struct.h>
* #include <std_msgs/msg/string.h>
* const rosidl_message_type_support_t * string_ts =
* ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, String);
Expand Down Expand Up @@ -105,7 +105,7 @@ rcl_get_zero_initialized_publisher(void);
*
* ```c
* #include <rcl/rcl.h>
* #include <rosidl_generator_c/message_type_support_struct.h>
* #include <rosidl_runtime_c/message_type_support_struct.h>
* #include <std_msgs/msg/string.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
6 changes: 3 additions & 3 deletions rcl/include/rcl/service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C"
{
#endif

#include "rosidl_generator_c/service_type_support_struct.h"
#include "rosidl_runtime_c/service_type_support_struct.h"

#include "rcl/macros.h"
#include "rcl/node.h"
Expand Down Expand Up @@ -73,7 +73,7 @@ rcl_get_zero_initialized_service(void);
* For C, a macro can be used (for example `example_interfaces/AddTwoInts`):
*
* ```c
* #include <rosidl_generator_c/service_type_support_struct.h>
* #include <rosidl_runtime_c/service_type_support_struct.h>
* #include <example_interfaces/srv/add_two_ints.h>
* const rosidl_service_type_support_t * ts =
* ROSIDL_GET_SRV_TYPE_SUPPORT(example_interfaces, srv, AddTwoInts);
Expand Down Expand Up @@ -105,7 +105,7 @@ rcl_get_zero_initialized_service(void);
*
* ```c
* #include <rcl/rcl.h>
* #include <rosidl_generator_c/service_type_support_struct.h>
* #include <rosidl_runtime_c/service_type_support_struct.h>
* #include <example_interfaces/srv/add_two_ints.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
6 changes: 3 additions & 3 deletions rcl/include/rcl/subscription.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ extern "C"
{
#endif

#include "rosidl_generator_c/message_type_support_struct.h"
#include "rosidl_runtime_c/message_type_support_struct.h"

#include "rcl/macros.h"
#include "rcl/node.h"
Expand Down Expand Up @@ -73,7 +73,7 @@ rcl_get_zero_initialized_subscription(void);
* For C a macro can be used (for example `std_msgs/String`):
*
* ```c
* #include <rosidl_generator_c/message_type_support_struct.h>
* #include <rosidl_runtime_c/message_type_support_struct.h>
* #include <std_msgs/msg/string.h>
* const rosidl_message_type_support_t * string_ts =
* ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, String);
Expand Down Expand Up @@ -106,7 +106,7 @@ rcl_get_zero_initialized_subscription(void);
*
* ```c
* #include <rcl/rcl.h>
* #include <rosidl_generator_c/message_type_support_struct.h>
* #include <rosidl_runtime_c/message_type_support_struct.h>
* #include <std_msgs/msg/string.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
10 changes: 5 additions & 5 deletions rcl/src/rcl/logging_rosout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "rcutils/macros.h"
#include "rcutils/types/hash_map.h"
#include "rcutils/types/rcutils_ret.h"
#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"

#ifdef __cplusplus
extern "C"
Expand Down Expand Up @@ -265,10 +265,10 @@ void rcl_logging_rosout_output_handler(
log_message->stamp.nanosec = (timestamp % RCL_S_TO_NS(1));
log_message->level = severity;
log_message->line = (int32_t) location->line_number;
rosidl_generator_c__String__assign(&log_message->name, name);
rosidl_generator_c__String__assign(&log_message->msg, msg_array.buffer);
rosidl_generator_c__String__assign(&log_message->file, location->file_name);
rosidl_generator_c__String__assign(&log_message->function, location->function_name);
rosidl_runtime_c__String__assign(&log_message->name, name);
rosidl_runtime_c__String__assign(&log_message->msg, msg_array.buffer);
rosidl_runtime_c__String__assign(&log_message->file, location->file_name);
rosidl_runtime_c__String__assign(&log_message->function, location->function_name);
status = rcl_publish(&entry.publisher, log_message, NULL);
if (RCL_RET_OK != status) {
RCUTILS_SAFE_FWRITE_TO_STDERR("Failed to publish log message to rosout: ");
Expand Down
8 changes: 4 additions & 4 deletions rcl/test/rcl/test_events.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "rmw/incompatible_qos_events_statuses.h"

#include "test_msgs/msg/strings.h"
#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"

#include "osrf_testing_tools_cpp/scope_exit.hpp"

Expand Down Expand Up @@ -395,7 +395,7 @@ TEST_F(TestEventFixture, test_pubsub_no_deadline_missed)
{
test_msgs__msg__Strings msg;
test_msgs__msg__Strings__init(&msg);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg.string_value, test_string));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg.string_value, test_string));
ret = rcl_publish(&publisher, &msg, nullptr);
test_msgs__msg__Strings__fini(&msg);
EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str;
Expand Down Expand Up @@ -462,7 +462,7 @@ TEST_F(TestEventFixture, test_pubsub_deadline_missed)
{
test_msgs__msg__Strings msg;
test_msgs__msg__Strings__init(&msg);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg.string_value, test_string));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg.string_value, test_string));
ret = rcl_publish(&publisher, &msg, nullptr);
test_msgs__msg__Strings__fini(&msg);
EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str;
Expand Down Expand Up @@ -537,7 +537,7 @@ TEST_F(TestEventFixture, test_pubsub_liveliness_kill_pub)
{
test_msgs__msg__Strings msg;
test_msgs__msg__Strings__init(&msg);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg.string_value, test_string));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg.string_value, test_string));
ret = rcl_publish(&publisher, &msg, nullptr);
test_msgs__msg__Strings__fini(&msg);
EXPECT_EQ(ret, RCL_RET_OK) << rcl_get_error_string().str;
Expand Down
2 changes: 1 addition & 1 deletion rcl/test/rcl/test_info_by_topic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "rmw/error_handling.h"

#include "test_msgs/msg/strings.h"
#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"

#include "osrf_testing_tools_cpp/scope_exit.hpp"

Expand Down
6 changes: 3 additions & 3 deletions rcl/test/rcl/test_publisher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "rcl/rcl.h"
#include "test_msgs/msg/basic_types.h"
#include "test_msgs/msg/strings.h"
#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"

#include "./failing_allocator_functions.hpp"
#include "osrf_testing_tools_cpp/scope_exit.hpp"
Expand Down Expand Up @@ -118,7 +118,7 @@ TEST_F(CLASSNAME(TestPublisherFixture, RMW_IMPLEMENTATION), test_publisher_nomin
});
test_msgs__msg__Strings msg;
test_msgs__msg__Strings__init(&msg);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg.string_value, "testing"));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg.string_value, "testing"));
ret = rcl_publish(&publisher, &msg, nullptr);
test_msgs__msg__Strings__fini(&msg);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
Expand Down Expand Up @@ -171,7 +171,7 @@ TEST_F(CLASSNAME(TestPublisherFixture, RMW_IMPLEMENTATION), test_publishers_diff

test_msgs__msg__Strings msg_string;
test_msgs__msg__Strings__init(&msg_string);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg_string.string_value, "testing"));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg_string.string_value, "testing"));
ret = rcl_publish(&publisher_in_namespace, &msg_string, nullptr);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
}
Expand Down
4 changes: 2 additions & 2 deletions rcl/test/rcl/test_subscription.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "rcl/rcl.h"
#include "test_msgs/msg/basic_types.h"
#include "test_msgs/msg/strings.h"
#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"

#include "osrf_testing_tools_cpp/scope_exit.hpp"
#include "rcl/error_handling.h"
Expand Down Expand Up @@ -236,7 +236,7 @@ TEST_F(CLASSNAME(TestSubscriptionFixture, RMW_IMPLEMENTATION), test_subscription
{
test_msgs__msg__Strings msg;
test_msgs__msg__Strings__init(&msg);
ASSERT_TRUE(rosidl_generator_c__String__assign(&msg.string_value, test_string));
ASSERT_TRUE(rosidl_runtime_c__String__assign(&msg.string_value, test_string));
ret = rcl_publish(&publisher, &msg, nullptr);
test_msgs__msg__Strings__fini(&msg);
ASSERT_EQ(RCL_RET_OK, ret) << rcl_get_error_string().str;
Expand Down
2 changes: 1 addition & 1 deletion rcl/test/test_namespace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "rcl/rcl.h"
#include "rcl/graph.h"

#include "rosidl_generator_c/string_functions.h"
#include "rosidl_runtime_c/string_functions.h"
#include "test_msgs/srv/basic_types.h"

#include "osrf_testing_tools_cpp/scope_exit.hpp"
Expand Down
4 changes: 2 additions & 2 deletions rcl_action/include/rcl_action/action_client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ rcl_action_get_zero_initialized_client(void);
* For C, a macro can be used (for example `example_interfaces/Fibonacci`):
*
* ```c
* #include <rosidl_generator_c/action_type_support_struct.h>
* #include <rosidl_runtime_c/action_type_support_struct.h>
* #include <example_interfaces/action/fibonacci.h>
* const rosidl_action_type_support_t * ts =
* ROSIDL_GET_ACTION_TYPE_SUPPORT(example_interfaces, Fibonacci);
Expand Down Expand Up @@ -127,7 +127,7 @@ rcl_action_get_zero_initialized_client(void);
* ```c
* #include <rcl/rcl.h>
* #include <rcl_action/action_client.h>
* #include <rosidl_generator_c/action_type_support_struct.h>
* #include <rosidl_runtime_c/action_type_support_struct.h>
* #include <example_interfaces/action/fibonacci.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
6 changes: 3 additions & 3 deletions rcl_action/include/rcl_action/action_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extern "C"
#include "rcl/node.h"
#include "rcl/time.h"

#include "rosidl_generator_c/action_type_support_struct.h"
#include "rosidl_runtime_c/action_type_support_struct.h"

/// Internal rcl_action implementation struct.
struct rcl_action_server_impl_t;
Expand Down Expand Up @@ -91,7 +91,7 @@ rcl_action_get_zero_initialized_server(void);
* For C, a macro can be used (for example `example_interfaces/Fibonacci`):
*
* ```c
* #include <rosidl_generator_c/action_type_support_struct.h>
* #include <rosidl_runtime_c/action_type_support_struct.h>
* #include <example_interfaces/action/fibonacci.h>
* const rosidl_action_type_support_t * ts =
* ROSIDL_GET_ACTION_TYPE_SUPPORT(example_interfaces, Fibonacci);
Expand Down Expand Up @@ -124,7 +124,7 @@ rcl_action_get_zero_initialized_server(void);
* ```c
* #include <rcl/rcl.h>
* #include <rcl_action/rcl_action.h>
* #include <rosidl_generator_c/action_type_support_struct.h>
* #include <rosidl_runtime_c/action_type_support_struct.h>
* #include <example_interfaces/action/fibonacci.h>
*
* rcl_node_t node = rcl_get_zero_initialized_node();
Expand Down
2 changes: 1 addition & 1 deletion rcl_action/include/rcl_action/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern "C"
#include "rcl/macros.h"
#include "rcl/types.h"

#include "rosidl_generator_c/action_type_support_struct.h"
#include "rosidl_runtime_c/action_type_support_struct.h"

// rcl action specific ret codes in 2XXX
/// Action name does not pass validation return code.
Expand Down
10 changes: 5 additions & 5 deletions rcl_action/test/rcl_action/test_action_communication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "rcl/error_handling.h"
#include "rcl/rcl.h"

#include "rosidl_generator_c/primitives_sequence_functions.h"
#include "rosidl_runtime_c/primitives_sequence_functions.h"

#include "test_msgs/action/fibonacci.h"

Expand Down Expand Up @@ -448,7 +448,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_result

// Initialize result response
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&outgoing_result_response.result.sequence, 4));
outgoing_result_response.result.sequence.data[0] = 0;
outgoing_result_response.result.sequence.data[1] = 1;
Expand Down Expand Up @@ -593,7 +593,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_valid_feedba

// Initialize feedback
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&outgoing_feedback.feedback.sequence, 3));
outgoing_feedback.feedback.sequence.data[0] = 0;
outgoing_feedback.feedback.sequence.data[1] = 1;
Expand Down Expand Up @@ -952,7 +952,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_resu

// Initialize result response
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&outgoing_result_response.result.sequence, 4));
outgoing_result_response.result.sequence.data[0] = 0;
outgoing_result_response.result.sequence.data[1] = 1;
Expand Down Expand Up @@ -1015,7 +1015,7 @@ TEST_F(CLASSNAME(TestActionCommunication, RMW_IMPLEMENTATION), test_invalid_feed

// Initialize feedback
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&outgoing_feedback.feedback.sequence, 3));
outgoing_feedback.feedback.sequence.data[0] = 0;
outgoing_feedback.feedback.sequence.data[1] = 1;
Expand Down
10 changes: 5 additions & 5 deletions rcl_action/test/rcl_action/test_action_interaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "rcl/error_handling.h"
#include "rcl/rcl.h"

#include "rosidl_generator_c/primitives_sequence_functions.h"
#include "rosidl_runtime_c/primitives_sequence_functions.h"

#include "test_msgs/action/fibonacci.h"

Expand Down Expand Up @@ -307,7 +307,7 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in

// Initialize feedback
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&this->outgoing_feedback.feedback.sequence, 3));
this->outgoing_feedback.feedback.sequence.data[0] = 0;
this->outgoing_feedback.feedback.sequence.data[1] = 1;
Expand Down Expand Up @@ -398,7 +398,7 @@ TEST_F(CLASSNAME(TestActionClientServerInteraction, RMW_IMPLEMENTATION), test_in

// Initialize result response
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&this->outgoing_result_response.result.sequence, 4));
this->outgoing_result_response.result.sequence.data[0] = 0;
this->outgoing_result_response.result.sequence.data[1] = 1;
Expand Down Expand Up @@ -575,7 +575,7 @@ TEST_F(

// Initialize feedback
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&this->outgoing_feedback.feedback.sequence, 3));
this->outgoing_feedback.feedback.sequence.data[0] = 0;
this->outgoing_feedback.feedback.sequence.data[1] = 1;
Expand Down Expand Up @@ -666,7 +666,7 @@ TEST_F(

// Initialize result response
ASSERT_TRUE(
rosidl_generator_c__int32__Sequence__init(
rosidl_runtime_c__int32__Sequence__init(
&this->outgoing_result_response.result.sequence, 4));
this->outgoing_result_response.result.sequence.data[0] = 0;
this->outgoing_result_response.result.sequence.data[1] = 1;
Expand Down
Loading