Merge branch 'sloretz/allow_generated_idl' of https://github.com/ros2…

…/rosidl_python into sloretz/allow_generated_idl
ros2 · Nov 8, 2018 · c8dbeae · c8dbeae
2 parents b23bc68 + 47e369b
commit c8dbeae
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/rosidl_generator_py/resource/_msg_support.c.em b/rosidl_generator_py/resource/_msg_support.c.em
@@ -28,8 +28,8 @@ nested_array_dict = {}
 @[for field in spec.fields]@
 @[  if field.type.is_array and have_not_included_primitive_arrays]@
 @{have_not_included_primitive_arrays = False}@
-#include <rosidl_generator_c/primitives_array.h>
-#include <rosidl_generator_c/primitives_array_functions.h>
+#include <rosidl_generator_c/primitives_sequence.h>
+#include <rosidl_generator_c/primitives_sequence_functions.h>
 
 @[  end if]@
 @[  if field.type.type == 'string' and have_not_included_string]@
@@ -134,8 +134,8 @@ lowercase_field_type = convert_camel_case_to_lower_case_underscore(field.type.ty
       Py_DECREF(field);
       return false;
     }
-    if (!@(nested_type)__Array__init(&(ros_message->@(field.name)), size)) {
-      PyErr_SetString(PyExc_RuntimeError, "unable to create @(nested_type)__Array ros_message");
+    if (!@(nested_type)__Sequence__init(&(ros_message->@(field.name)), size)) {
+      PyErr_SetString(PyExc_RuntimeError, "unable to create @(nested_type)__Sequence ros_message");
       Py_DECREF(seq_field);
       Py_DECREF(field);
       return false;
@@ -173,15 +173,15 @@ lowercase_field_type = convert_camel_case_to_lower_case_underscore(field.type.ty
       return false;
     }
 @[      if field.type.type == 'string']@
-    if (!rosidl_generator_c__String__Array__init(&(ros_message->@(field.name)), size)) {
-      PyErr_SetString(PyExc_RuntimeError, "unable to create String__Array ros_message");
+    if (!rosidl_generator_c__String__Sequence__init(&(ros_message->@(field.name)), size)) {
+      PyErr_SetString(PyExc_RuntimeError, "unable to create String__Sequence ros_message");
       Py_DECREF(seq_field);
       Py_DECREF(field);
       return false;
     }
 @[      else]@
-    if (!rosidl_generator_c__@(field.type.type)__Array__init(&(ros_message->@(field.name)), size)) {
-      PyErr_SetString(PyExc_RuntimeError, "unable to create @(field.type.type)__Array ros_message");
+    if (!rosidl_generator_c__@(field.type.type)__Sequence__init(&(ros_message->@(field.name)), size)) {
+      PyErr_SetString(PyExc_RuntimeError, "unable to create @(field.type.type)__Sequence ros_message");
       Py_DECREF(seq_field);
       Py_DECREF(field);
       return false;