Skip to content

Commit 034e526

Browse files
authored
rename rosidl_generator_c 'namespace' to rosidl_runtime_c (#458)
* move rosidl_generator_c headers Signed-off-by: Dirk Thomas <[email protected]> * rename rosidl_generator_c 'namespace' Signed-off-by: Dirk Thomas <[email protected]>
1 parent 9025bd1 commit 034e526

File tree

52 files changed

+475
-475
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+475
-475
lines changed

rosidl_generator_c/resource/action__type_support.h.em

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@# Included from rosidl_generator_c/resource/idl__type_support.h.em
2-
@{header_file = 'rosidl_generator_c/action_type_support_struct.h'}@
2+
@{header_file = 'rosidl_runtime_c/action_type_support_struct.h'}@
33
@[if header_file in include_directives]@
44
// already included above
55
// @

rosidl_generator_c/resource/idl__functions.h.em

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extern "C"
3030
#include <stdbool.h>
3131
#include <stdlib.h>
3232

33-
#include "rosidl_generator_c/visibility_control.h"
33+
#include "rosidl_runtime_c/visibility_control.h"
3434
#include "@(package_name)/msg/rosidl_generator_c__visibility_control.h"
3535

3636
#include "@(include_base)__struct.h"

rosidl_generator_c/resource/msg__functions.c.em

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ includes = OrderedDict()
2929
for member in message.structure.members:
3030
if isinstance(member.type, AbstractSequence) and isinstance(member.type.value_type, BasicType):
3131
member_names = includes.setdefault(
32-
'rosidl_generator_c/primitives_sequence_functions.h', [])
32+
'rosidl_runtime_c/primitives_sequence_functions.h', [])
3333
member_names.append(member.name)
3434
continue
3535
type_ = member.type
3636
if isinstance(type_, AbstractNestedType):
3737
type_ = type_.value_type
3838
if isinstance(type_, AbstractString):
39-
member_names = includes.setdefault('rosidl_generator_c/string_functions.h', [])
39+
member_names = includes.setdefault('rosidl_runtime_c/string_functions.h', [])
4040
member_names.append(member.name)
4141
elif isinstance(type_, AbstractWString):
4242
member_names = includes.setdefault(
43-
'rosidl_generator_c/u16string_functions.h', [])
43+
'rosidl_runtime_c/u16string_functions.h', [])
4444
member_names.append(member.name)
4545
elif isinstance(type_, NamespacedType):
4646
include_prefix = idl_structure_type_to_c_include_prefix(type_)

rosidl_generator_c/resource/msg__struct.h.em

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ includes = OrderedDict()
2929
for member in message.structure.members:
3030
if isinstance(member.type, AbstractSequence) and isinstance(member.type.value_type, BasicType):
3131
member_names = includes.setdefault(
32-
'rosidl_generator_c/primitives_sequence.h', [])
32+
'rosidl_runtime_c/primitives_sequence.h', [])
3333
member_names.append(member.name)
3434
continue
3535
type_ = member.type
3636
if isinstance(type_, AbstractNestedType):
3737
type_ = type_.value_type
3838
if isinstance(type_, AbstractString):
39-
member_names = includes.setdefault('rosidl_generator_c/string.h', [])
39+
member_names = includes.setdefault('rosidl_runtime_c/string.h', [])
4040
member_names.append(member.name)
4141
elif isinstance(type_, AbstractWString):
4242
member_names = includes.setdefault(
43-
'rosidl_generator_c/u16string.h', [])
43+
'rosidl_runtime_c/u16string.h', [])
4444
member_names.append(member.name)
4545
elif isinstance(type_, NamespacedType):
4646
include_prefix = idl_structure_type_to_c_include_prefix(type_)

rosidl_generator_c/resource/msg__type_support.h.em

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@# Included from rosidl_generator_c/resource/idl__type_support.h.em
2-
@{header_file = 'rosidl_generator_c/message_type_support_struct.h'}@
2+
@{header_file = 'rosidl_runtime_c/message_type_support_struct.h'}@
33
@[if header_file in include_directives]@
44
// already included above
55
// @

rosidl_generator_c/resource/srv__type_support.h.em

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ TEMPLATE(
1313
include_directives=include_directives)
1414
}@
1515

16-
@{header_file = 'rosidl_generator_c/service_type_support_struct.h'}@
16+
@{header_file = 'rosidl_runtime_c/service_type_support_struct.h'}@
1717
@[if header_file in include_directives]@
1818
// already included above
1919
// @

rosidl_generator_c/rosidl_generator_c/__init__.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def idl_type_to_c(type_):
124124
assert False, 'The array size is part of the variable'
125125
if isinstance(type_, AbstractSequence):
126126
if isinstance(type_.value_type, BasicType):
127-
c_type = 'rosidl_generator_c__' + type_.value_type.typename.replace(' ', '_')
127+
c_type = 'rosidl_runtime_c__' + type_.value_type.typename.replace(' ', '_')
128128
else:
129129
c_type = basetype_to_c(type_.value_type)
130130
c_type += '__Sequence'
@@ -136,9 +136,9 @@ def basetype_to_c(basetype):
136136
if isinstance(basetype, BasicType):
137137
return BASIC_IDL_TYPES_TO_C[basetype.typename]
138138
if isinstance(basetype, AbstractString):
139-
return 'rosidl_generator_c__String'
139+
return 'rosidl_runtime_c__String'
140140
if isinstance(basetype, AbstractWString):
141-
return 'rosidl_generator_c__U16String'
141+
return 'rosidl_runtime_c__U16String'
142142
if isinstance(basetype, NamespacedType):
143143
return idl_structure_type_to_c_typename(basetype)
144144
assert False, str(basetype)

0 commit comments

Comments
 (0)