Skip to content

Commit 0b938b0

Browse files
dirk-thomasdirk-thomas
committed
rename rosidl_namespace_cpp namespace (#456)
Signed-off-by: Dirk Thomas <[email protected]>
1 parent 136aaf1 commit 0b938b0

File tree

17 files changed

+60
-61
lines changed

17 files changed

+60
-61
lines changed

‎rosidl_generator_cpp/resource/idl__builder.hpp.em‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include_directives = set()
2525
#define @(header_guard_variable)
2626

2727
#include "@(include_base)__struct.hpp"
28-
#include <rosidl_generator_cpp/message_initialization.hpp>
28+
#include <rosidl_runtime_cpp/message_initialization.hpp>
2929
#include <algorithm>
3030
#include <utility>
3131

‎rosidl_generator_cpp/resource/idl__struct.hpp.em‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ include_directives = set()
2323
#ifndef @(header_guard_variable)
2424
#define @(header_guard_variable)
2525

26-
#include <rosidl_generator_cpp/bounded_vector.hpp>
27-
#include <rosidl_generator_cpp/message_initialization.hpp>
26+
#include <rosidl_runtime_cpp/bounded_vector.hpp>
27+
#include <rosidl_runtime_cpp/message_initialization.hpp>
2828
#include <algorithm>
2929
#include <array>
3030
#include <memory>

‎rosidl_generator_cpp/resource/idl__traits.hpp.em‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ include_directives = set()
2525
#define @(header_guard_variable)
2626

2727
#include "@(include_base)__struct.hpp"
28-
#include <rosidl_generator_cpp/traits.hpp>
28+
#include <rosidl_runtime_cpp/traits.hpp>
2929
#include <stdint.h>
3030
#include <type_traits>
3131

‎rosidl_generator_cpp/resource/msg__builder.hpp.em‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ explicit @
3030
Init_@(message.structure.namespaced_type.name)_@(field_name)@
3131
@[ if index == 0]@
3232
()
33-
: msg_(::rosidl_generator_cpp::MessageInitialization::SKIP)
33+
: msg_(::rosidl_runtime_cpp::MessageInitialization::SKIP)
3434
@[ else]@
3535
(::@(message_typename) & msg)
3636
: msg_(msg)
@@ -70,7 +70,7 @@ inline
7070
auto build<::@(message_typename)>()
7171
{
7272
@[ if len(message.structure.members) == 1 and message.structure.members[0].name == EMPTY_STRUCTURE_REQUIRED_MEMBER_NAME]@
73-
return ::@(message_typename)(rosidl_generator_cpp::MessageInitialization::ZERO);
73+
return ::@(message_typename)(rosidl_runtime_cpp::MessageInitialization::ZERO);
7474
@[ else]@
7575
return @('::'.join(message.structure.namespaced_type.namespaces))::builder::Init_@(message.structure.namespaced_type.name)_@(message.structure.members[0].name)();
7676
@[ end if]@

‎rosidl_generator_cpp/resource/msg__struct.hpp.em‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def generate_zero_string(membset, fill_args):
141141
strlist.append('this->%s = %s;' % (member.name, member.zero_value))
142142
return strlist
143143
}@
144-
explicit @(message.structure.namespaced_type.name)_(rosidl_generator_cpp::MessageInitialization _init = rosidl_generator_cpp::MessageInitialization::ALL)
144+
explicit @(message.structure.namespaced_type.name)_(rosidl_runtime_cpp::MessageInitialization _init = rosidl_runtime_cpp::MessageInitialization::ALL)
145145
@[if init_list]@
146146
: @(',\n '.join(init_list))
147147
@[end if]@
@@ -158,16 +158,16 @@ non_defaulted_zero_initialized_members = [
158158
]
159159
}@
160160
@[if default_value_members]@
161-
if (rosidl_generator_cpp::MessageInitialization::ALL == _init ||
162-
rosidl_generator_cpp::MessageInitialization::DEFAULTS_ONLY == _init)
161+
if (rosidl_runtime_cpp::MessageInitialization::ALL == _init ||
162+
rosidl_runtime_cpp::MessageInitialization::DEFAULTS_ONLY == _init)
163163
{
164164
@[ for membset in default_value_members]@
165165
@[ for line in generate_default_string(membset)]@
166166
@(line)
167167
@[ end for]@
168168
@[ end for]@
169169
@[ if zero_value_members]@
170-
} else if (rosidl_generator_cpp::MessageInitialization::ZERO == _init) {
170+
} else if (rosidl_runtime_cpp::MessageInitialization::ZERO == _init) {
171171
@[ for membset in zero_value_members]@
172172
@[ for line in generate_zero_string(membset, '_init')]@
173173
@(line)
@@ -177,8 +177,8 @@ non_defaulted_zero_initialized_members = [
177177
}
178178
@[ end if]@
179179
@[ if non_defaulted_zero_initialized_members]@
180-
if (rosidl_generator_cpp::MessageInitialization::ALL == _init ||
181-
rosidl_generator_cpp::MessageInitialization::ZERO == _init)
180+
if (rosidl_runtime_cpp::MessageInitialization::ALL == _init ||
181+
rosidl_runtime_cpp::MessageInitialization::ZERO == _init)
182182
{
183183
@[ for membset in non_defaulted_zero_initialized_members]@
184184
@[ for line in generate_zero_string(membset, '_init')]@
@@ -191,7 +191,7 @@ non_defaulted_zero_initialized_members = [
191191
@[end if]@
192192
}
193193

194-
explicit @(message.structure.namespaced_type.name)_(const ContainerAllocator & _alloc, rosidl_generator_cpp::MessageInitialization _init = rosidl_generator_cpp::MessageInitialization::ALL)
194+
explicit @(message.structure.namespaced_type.name)_(const ContainerAllocator & _alloc, rosidl_runtime_cpp::MessageInitialization _init = rosidl_runtime_cpp::MessageInitialization::ALL)
195195
@[if alloc_list]@
196196
: @(',\n '.join(alloc_list))
197197
@[end if]@
@@ -203,16 +203,16 @@ non_defaulted_zero_initialized_members = [
203203
(void)_alloc;
204204
@[end if]@
205205
@[if default_value_members]@
206-
if (rosidl_generator_cpp::MessageInitialization::ALL == _init ||
207-
rosidl_generator_cpp::MessageInitialization::DEFAULTS_ONLY == _init)
206+
if (rosidl_runtime_cpp::MessageInitialization::ALL == _init ||
207+
rosidl_runtime_cpp::MessageInitialization::DEFAULTS_ONLY == _init)
208208
{
209209
@[ for membset in default_value_members]@
210210
@[ for line in generate_default_string(membset)]@
211211
@(line)
212212
@[ end for]@
213213
@[ end for]@
214214
@[ if zero_value_members]@
215-
} else if (rosidl_generator_cpp::MessageInitialization::ZERO == _init) {
215+
} else if (rosidl_runtime_cpp::MessageInitialization::ZERO == _init) {
216216
@[ for membset in zero_value_members]@
217217
@[ for line in generate_zero_string(membset, '_alloc, _init')]@
218218
@(line)
@@ -222,8 +222,8 @@ non_defaulted_zero_initialized_members = [
222222
}
223223
@[end if]@
224224
@[if non_defaulted_zero_initialized_members]@
225-
if (rosidl_generator_cpp::MessageInitialization::ALL == _init ||
226-
rosidl_generator_cpp::MessageInitialization::ZERO == _init)
225+
if (rosidl_runtime_cpp::MessageInitialization::ALL == _init ||
226+
rosidl_runtime_cpp::MessageInitialization::ZERO == _init)
227227
{
228228
@[ for membset in non_defaulted_zero_initialized_members]@
229229
@[ for line in generate_zero_string(membset, '_alloc, _init')]@

‎rosidl_generator_cpp/rosidl_generator_cpp/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def msg_type_to_cpp(type_):
121121
'rebind<%s>::other>') % (cpp_type, cpp_type)
122122
elif isinstance(type_, BoundedSequence):
123123
return \
124-
('rosidl_generator_cpp::BoundedVector<%s, %u, typename ContainerAllocator::' +
124+
('rosidl_runtime_cpp::BoundedVector<%s, %u, typename ContainerAllocator::' +
125125
'template rebind<%s>::other>') % (cpp_type, type_.maximum_size, cpp_type)
126126
else:
127127
assert isinstance(type_, Array)

‎rosidl_generator_cpp/test/test_bounded_vector.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include <gtest/gtest.h>
1616
#include <utility>
1717

18-
#include "rosidl_generator_cpp/bounded_vector.hpp"
18+
#include "rosidl_runtime_cpp/bounded_vector.hpp"
1919

2020

2121
TEST(rosidl_generator_cpp, bounded_vector) {
22-
rosidl_generator_cpp::BoundedVector<int, 2> v;
22+
rosidl_runtime_cpp::BoundedVector<int, 2> v;
2323
ASSERT_EQ(v.size(), 0u);
2424
ASSERT_EQ(v.max_size(), 2u);
2525
v.push_back(1);
@@ -35,7 +35,7 @@ TEST(rosidl_generator_cpp, bounded_vector) {
3535
}
3636

3737
TEST(rosidl_generator_cpp, bounded_vector_rvalue) {
38-
rosidl_generator_cpp::BoundedVector<int, 2> v;
38+
rosidl_runtime_cpp::BoundedVector<int, 2> v;
3939
// emplace back
4040
ASSERT_EQ(v.size(), 0u);
4141
ASSERT_EQ(v.max_size(), 2u);

‎rosidl_generator_cpp/test/test_interfaces.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void test_message_basic_types(rosidl_generator_cpp::msg::BasicTypes message)
175175

176176
#define TEST_BOUNDED_SEQUENCE_TYPES( \
177177
Message, FieldName, BasicType, ArraySize, MinVal, MaxVal) \
178-
rosidl_generator_cpp::BoundedVector<BasicType, ArraySize> pattern_ ## FieldName; \
178+
rosidl_runtime_cpp::BoundedVector<BasicType, ArraySize> pattern_ ## FieldName; \
179179
Message.FieldName.resize(ArraySize); \
180180
pattern_ ## FieldName.resize(ArraySize); \
181181
test_vector_fill<decltype(pattern_ ## FieldName)>( \
@@ -185,7 +185,7 @@ void test_message_basic_types(rosidl_generator_cpp::msg::BasicTypes message)
185185

186186
#define TEST_BOUNDED_SEQUENCE_STRING( \
187187
Message, FieldName, BasicType, ArraySize, MinVal, MaxVal, MinLength, MaxLength) \
188-
rosidl_generator_cpp::BoundedVector<BasicType, ArraySize> pattern_ ## FieldName; \
188+
rosidl_runtime_cpp::BoundedVector<BasicType, ArraySize> pattern_ ## FieldName; \
189189
Message.FieldName.resize(ArraySize); \
190190
pattern_ ## FieldName.resize(ArraySize); \
191191
test_vector_fill<decltype(pattern_ ## FieldName)>( \

‎rosidl_generator_cpp/test/test_msg_initialization.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TEST(Test_msg_initialization, no_arg_constructor) {
7777

7878
TEST(Test_msg_initialization, all_constructor) {
7979
rosidl_generator_cpp::msg::Defaults def(
80-
rosidl_generator_cpp::MessageInitialization::ALL);
80+
rosidl_runtime_cpp::MessageInitialization::ALL);
8181
ASSERT_TRUE(def.bool_value);
8282
ASSERT_EQ(50, def.byte_value);
8383
ASSERT_EQ(100, def.char_value);
@@ -109,7 +109,7 @@ TEST(Test_msg_initialization, all_constructor) {
109109

110110
TEST(Test_msg_initialization, zero_constructor) {
111111
rosidl_generator_cpp::msg::Defaults def(
112-
rosidl_generator_cpp::MessageInitialization::ZERO);
112+
rosidl_runtime_cpp::MessageInitialization::ZERO);
113113
ASSERT_FALSE(def.bool_value);
114114
ASSERT_EQ(0, def.byte_value);
115115
ASSERT_EQ(0, def.char_value);
@@ -141,7 +141,7 @@ TEST(Test_msg_initialization, zero_constructor) {
141141

142142
TEST(Test_msg_initialization, defaults_only_constructor) {
143143
rosidl_generator_cpp::msg::Defaults def(
144-
rosidl_generator_cpp::MessageInitialization::DEFAULTS_ONLY);
144+
rosidl_runtime_cpp::MessageInitialization::DEFAULTS_ONLY);
145145
ASSERT_TRUE(def.bool_value);
146146
ASSERT_EQ(50, def.byte_value);
147147
ASSERT_EQ(100, def.char_value);
@@ -179,7 +179,7 @@ TEST(Test_msg_initialization, skip_constructor) {
179179
std::memset(memory, 0xfe, sizeof(rosidl_generator_cpp::msg::BoundedSequences));
180180
rosidl_generator_cpp::msg::BoundedSequences * bounded =
181181
new(memory) rosidl_generator_cpp::msg::BoundedSequences(
182-
rosidl_generator_cpp::MessageInitialization::SKIP);
182+
rosidl_runtime_cpp::MessageInitialization::SKIP);
183183

184184
// ensures that the memory gets freed even if an ASSERT is raised
185185
SCOPE_EXIT(bounded->~BoundedSequences_(); delete[] memory);

‎rosidl_runtime_cpp/include/rosidl_runtime_cpp/action_type_support_decl.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef ROSIDL_GENERATOR_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_
16-
#define ROSIDL_GENERATOR_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_
15+
#ifndef ROSIDL_RUNTIME_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_
16+
#define ROSIDL_RUNTIME_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_
1717

1818
#include <rosidl_generator_c/action_type_support_struct.h>
1919
#include <rosidl_generator_c/visibility_control.h>
2020

21-
namespace rosidl_generator_cpp
21+
namespace rosidl_runtime_cpp
2222
{
2323

2424
template<typename T>
2525
const rosidl_action_type_support_t * get_action_type_support_handle();
2626

27-
} // namespace rosidl_generator_cpp
27+
} // namespace rosidl_runtime_cpp
2828

29-
#endif // ROSIDL_GENERATOR_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_
29+
#endif // ROSIDL_RUNTIME_CPP__ACTION_TYPE_SUPPORT_DECL_HPP_

0 commit comments

Comments
 (0)