rename rosidl_generator_c namespace to rosidl_runtime_c (#616)

dirk-thomas · web-flow · commit 94b5a1d7d089 · 2020-04-10T21:58:19.000-07:00
Signed-off-by: Dirk Thomas &lt;dirk-thomas@users.noreply.github.com&gt;
diff --git a/rcl/include/rcl/client.h b/rcl/include/rcl/client.h
@@ -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"
@@ -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 =
@@ -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();
diff --git a/rcl/include/rcl/graph.h b/rcl/include/rcl/graph.h
@@ -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"
diff --git a/rcl/include/rcl/publisher.h b/rcl/include/rcl/publisher.h
@@ -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"
@@ -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);
@@ -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();
diff --git a/rcl/include/rcl/service.h b/rcl/include/rcl/service.h
@@ -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"
@@ -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);
@@ -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();
diff --git a/rcl/include/rcl/subscription.h b/rcl/include/rcl/subscription.h
@@ -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"
@@ -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);
@@ -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();
diff --git a/rcl/src/rcl/logging_rosout.c b/rcl/src/rcl/logging_rosout.c
@@ -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"
@@ -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: ");
diff --git a/rcl/test/rcl/test_events.cpp b/rcl/test/rcl/test_events.cpp
@@ -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"
 
@@ -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;
@@ -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;
@@ -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;
diff --git a/rcl/test/rcl/test_info_by_topic.cpp b/rcl/test/rcl/test_info_by_topic.cpp
@@ -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"
 
diff --git a/rcl/test/rcl/test_publisher.cpp b/rcl/test/rcl/test_publisher.cpp
@@ -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"
@@ -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;
@@ -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;
 }
diff --git a/rcl/test/rcl/test_subscription.cpp b/rcl/test/rcl/test_subscription.cpp
@@ -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"
@@ -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;
diff --git a/rcl/test/test_namespace.cpp b/rcl/test/test_namespace.cpp
@@ -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"
diff --git a/rcl_action/include/rcl_action/action_client.h b/rcl_action/include/rcl_action/action_client.h
@@ -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);
@@ -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();
diff --git a/rcl_action/include/rcl_action/action_server.h b/rcl_action/include/rcl_action/action_server.h
@@ -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;
@@ -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);
@@ -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();
diff --git a/rcl_action/include/rcl_action/types.h b/rcl_action/include/rcl_action/types.h
@@ -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.
diff --git a/rcl_action/test/rcl_action/test_action_communication.cpp b/rcl_action/test/rcl_action/test_action_communication.cpp
@@ -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"
 
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/rcl_action/test/rcl_action/test_action_interaction.cpp b/rcl_action/test/rcl_action/test_action_interaction.cpp
@@ -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"
 
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/rcl_lifecycle/src/com_interface.c b/rcl_lifecycle/src/com_interface.c

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ extern "C"`
`20`	`20`	`{`
`21`	`21`	`#endif`
`22`	`22`
`23`		`-#include "rosidl_generator_c/service_type_support_struct.h"`
	`23`	`+#include "rosidl_runtime_c/service_type_support_struct.h"`
`24`	`24`
`25`	`25`	`#include "rcl/macros.h"`
`26`	`26`	`#include "rcl/node.h"`
`@@ -75,7 +75,7 @@ rcl_get_zero_initialized_client(void);`
`75`	`75`	* For C, a macro can be used (for example `example_interfaces/AddTwoInts`):
`76`	`76`	`*`
`77`	`77`	* ```c
`78`		`- * #include <rosidl_generator_c/service_type_support_struct.h>`
	`78`	`+ * #include <rosidl_runtime_c/service_type_support_struct.h>`
`79`	`79`	`* #include <example_interfaces/srv/add_two_ints.h>`
`80`	`80`	`*`
`81`	`81`	`* const rosidl_service_type_support_t * ts =`
`@@ -109,7 +109,7 @@ rcl_get_zero_initialized_client(void);`
`109`	`109`	`*`
`110`	`110`	* ```c
`111`	`111`	`* #include <rcl/rcl.h>`
`112`		`- * #include <rosidl_generator_c/service_type_support_struct.h>`
	`112`	`+ * #include <rosidl_runtime_c/service_type_support_struct.h>`
`113`	`113`	`* #include <example_interfaces/srv/add_two_ints.h>`
`114`	`114`	`*`
`115`	`115`	`* rcl_node_t node = rcl_get_zero_initialized_node();`