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

Update rmw_context_impl_t definition #300

Merged
merged 1 commit into from
Sep 15, 2021
+8 −8
Merged

Update rmw_context_impl_t definition #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions rmw_email_cpp/include/rmw_email_cpp/types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "email/wait_set.hpp"
#include "rmw/rmw.h"

struct rmw_context_impl_t
struct rmw_context_impl_s
{
// TODO(christophebedard) move to graph cache handler?
rmw_guard_condition_t * graph_guard_condition{nullptr};
Expand All @@ -36,10 +36,10 @@ struct rmw_context_impl_t

bool is_shutdown{false};

rmw_context_impl_t();
rmw_context_impl_s();

/// Context destruction, called when deleting this.
~rmw_context_impl_t();
~rmw_context_impl_s();

/// Called whenever a new node is created.
rmw_ret_t
Expand Down
10 changes: 5 additions & 5 deletions rmw_email_cpp/src/rmw_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,12 @@ extern "C" rmw_ret_t rmw_init_options_fini(rmw_init_options_t * init_options)
return ret;
}

rmw_context_impl_t::rmw_context_impl_t()
rmw_context_impl_s::rmw_context_impl_s()
{
RMW_EMAIL_LOG_DEBUG("initializing context implementation");
}

rmw_context_impl_t::~rmw_context_impl_t()
rmw_context_impl_s::~rmw_context_impl_s()
{
RMW_EMAIL_LOG_DEBUG("shutting down context implementation");
// Shutdown middleware
Expand All @@ -124,7 +124,7 @@ rmw_context_impl_t::~rmw_context_impl_t()
}

rmw_ret_t
rmw_context_impl_t::init(rmw_init_options_t * options, size_t domain_id)
rmw_context_impl_s::init(rmw_init_options_t * options, size_t domain_id)
{
static_cast<void>(options);
// There's no concept of "domain" with email, duh
Expand Down Expand Up @@ -159,7 +159,7 @@ rmw_context_impl_t::init(rmw_init_options_t * options, size_t domain_id)
}

rmw_ret_t
rmw_context_impl_t::fini()
rmw_context_impl_s::fini()
{
std::scoped_lock<std::mutex> lock(mutex_initialization);
if (0u != --this->node_count) {
Expand All @@ -171,7 +171,7 @@ rmw_context_impl_t::fini()
}

void
rmw_context_impl_t::cleanup()
rmw_context_impl_s::cleanup()
{
if (this->graph_guard_condition) {
rmw_email_cpp::destroy_guard_condition(this->graph_guard_condition);
Expand Down