simplify logic

ros2 · Mar 4, 2019 · 2337a69 · sloretz · Mar 4, 2019 · dirk-thomas
1 parent 70f5b8c
commit 2337a69
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/rosidl_typesupport_opensplice_cpp/resource/msg__type_support.cpp.em b/rosidl_typesupport_opensplice_cpp/resource/msg__type_support.cpp.em
@@ -241,14 +241,10 @@ convert_dds_message_to_ros(
     ros_message.@(member.name).resize(size);
 @[    end if]@
     for (DDS::ULong i = 0; i < size; i++) {
-@[    if isinstance(member.type.basetype, BaseString)]@
-      ros_message.@(member.name)[i] = dds_message.@(member.name)_[i];
-@[    elif isinstance(member.type.basetype, BasicType)]@
-@[      if member.type.basetype.type == 'boolean']@
+@[    if isinstance(member.type.basetype, BaseString) and member.type.basetype.type == 'boolean']@
       ros_message.@(member.name)[i] = (dds_message.@(member.name)_[i] != 0);
-@[      else]@
+@[    if isinstance(member.type.basetype, BaseString) or isinstance(member.type.basetype, BaseString)]@
       ros_message.@(member.name)[i] = dds_message.@(member.name)_[i];
-@[      end if]@
 @[    else]@
       @('::'.join(member.type.basetype.namespaces))::typesupport_opensplice_cpp::convert_dds_message_to_ros(
         dds_message.@(member.name)_[i], ros_message.@(member.name)[i]);