From f925ee70715b5d2eedf8190a73dcaac1037a1a88 Mon Sep 17 00:00:00 2001 From: "Hunter L. Allen" Date: Thu, 14 Mar 2019 10:03:48 -0400 Subject: [PATCH] Allow multiple initialization schemes for message types --- rosidl_generator_cpp/resource/msg__struct.hpp.em | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rosidl_generator_cpp/resource/msg__struct.hpp.em b/rosidl_generator_cpp/resource/msg__struct.hpp.em index aa727b124..fe4ffa880 100644 --- a/rosidl_generator_cpp/resource/msg__struct.hpp.em +++ b/rosidl_generator_cpp/resource/msg__struct.hpp.em @@ -150,8 +150,8 @@ def generate_zero_string(membset, fill_args): (void)_init; @[end if]@ @{ -members_if_all_defaults = [m for m in member_list if m.members[0].default_value and not m.members[0].zero_value] -members_else_if_zero = [m for m in member_list if m.members[0].default_value and m.members[0].zero_value] +members_if_all_defaults = [m for m in member_list if m.members[0].default_value] +members_else_if_zero = [m for m in member_list if m.members[0].zero_value] members_if_all_zero = [m for m in member_list if not m.members[0].default_value and m.members[0].zero_value] }@ @[if members_if_all_defaults]@