diff --git a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp index 1d263638d..a0a76c1b9 100644 --- a/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp +++ b/rmw_fastrtps_cpp/include/rmw_fastrtps_cpp/TypeSupport_impl.hpp @@ -420,6 +420,32 @@ void deserialize_field( } } +template<> +inline void deserialize_field( + const rosidl_typesupport_introspection_cpp::MessageMember * member, + void * field, + eprosima::fastcdr::Cdr & deser, + bool call_new) +{ + if (!member->is_array_) { + if (call_new) { + // Because std::string is a complex datatype, we need to make sure that + // the memory is initialized to something reasonable before eventually + // passing it as a reference to Fast-CDR. + new (field) std::string(); + } + deser >> *static_cast(field); + } else if (member->array_size_ && !member->is_upper_bound_) { + deser.deserializeArray(static_cast(field), member->array_size_); + } else { + auto & vector = *reinterpret_cast *>(field); + if (call_new) { + new(&vector) std::vector; + } + deser >> vector; + } +} + template void deserialize_field( const rosidl_typesupport_introspection_c__MessageMember * member,