Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rmw_context_impl_t definition #65

Merged
merged 2 commits into from
Sep 14, 2021
Merged

Update rmw_context_impl_t definition #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6fb7c1
Update rmw_context_impl_t definition
hidmic Sep 8, 2021
c447213
Comment struct rmw_context_impl_s definition
hidmic Sep 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions rmw_connextdds_common/include/rmw_connextdds/context.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ enum class RMW_Connext_RequestReplyMapping
Extended
};

struct rmw_context_impl_t
// Definition of struct rmw_context_impl_s as declared in rmw/init.h
struct rmw_context_impl_s
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as ros2/rmw_fastrtps#558 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See c447213.

{
rmw_dds_common::Context common;
rmw_context_t * base;
Expand Down Expand Up @@ -148,7 +149,7 @@ struct rmw_context_impl_t
std::map<std::string, RMW_Connext_MessageTypeSupport *> 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),
Expand All @@ -168,7 +169,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)
Expand Down