From b6fb7c12aa3fd0d8e33d0fe3148fb7c1ebfd230b Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Wed, 8 Sep 2021 15:18:22 -0300 Subject: [PATCH 1/2] Update rmw_context_impl_t definition Signed-off-by: Michel Hidalgo --- rmw_connextdds_common/include/rmw_connextdds/context.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rmw_connextdds_common/include/rmw_connextdds/context.hpp b/rmw_connextdds_common/include/rmw_connextdds/context.hpp index 7fc9e612..925ccf8f 100644 --- a/rmw_connextdds_common/include/rmw_connextdds/context.hpp +++ b/rmw_connextdds_common/include/rmw_connextdds/context.hpp @@ -58,7 +58,7 @@ enum class RMW_Connext_RequestReplyMapping Extended }; -struct rmw_context_impl_t +struct rmw_context_impl_s { rmw_dds_common::Context common; rmw_context_t * base; @@ -148,7 +148,7 @@ struct rmw_context_impl_t std::map registered_types; std::mutex endpoint_mutex; - explicit rmw_context_impl_t(rmw_context_t * const base) + explicit rmw_context_impl_s(rmw_context_t * const base) : common(), base(base), factory(nullptr), @@ -168,7 +168,7 @@ struct rmw_context_impl_t common.sub = nullptr; } - ~rmw_context_impl_t() + ~rmw_context_impl_s() { if (0u != this->node_count) { RMW_CONNEXT_LOG_ERROR_A("not all nodes finalized: %lu", this->node_count) From c447213e916c7114b0f9977821b1363c8b9b113e Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Mon, 13 Sep 2021 16:16:07 -0300 Subject: [PATCH 2/2] Comment struct rmw_context_impl_s definition Signed-off-by: Michel Hidalgo --- rmw_connextdds_common/include/rmw_connextdds/context.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rmw_connextdds_common/include/rmw_connextdds/context.hpp b/rmw_connextdds_common/include/rmw_connextdds/context.hpp index 925ccf8f..3cc22bef 100644 --- a/rmw_connextdds_common/include/rmw_connextdds/context.hpp +++ b/rmw_connextdds_common/include/rmw_connextdds/context.hpp @@ -58,6 +58,7 @@ enum class RMW_Connext_RequestReplyMapping Extended }; +// Definition of struct rmw_context_impl_s as declared in rmw/init.h struct rmw_context_impl_s { rmw_dds_common::Context common;