Skip to content

Commit a617297

Browse files
committed
Drop unnecessary assertions.
Signed-off-by: Michel Hidalgo <[email protected]>
1 parent f6f78d0 commit a617297

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

rmw_fastrtps_cpp/src/rmw_node.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ rmw_destroy_node(rmw_node_t * node)
8787
node->implementation_identifier,
8888
eprosima_fastrtps_identifier,
8989
return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
90-
assert(node->context != nullptr);
9190

9291
rmw_context_t * context = node->context;
9392
rmw_ret_t ret = rmw_fastrtps_shared_cpp::__rmw_destroy_node(

rmw_fastrtps_dynamic_cpp/src/rmw_node.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ rmw_destroy_node(rmw_node_t * node)
8787
node->implementation_identifier,
8888
eprosima_fastrtps_identifier,
8989
return RMW_RET_INCORRECT_RMW_IMPLEMENTATION);
90-
assert(node->context != nullptr);
9190
rmw_context_t * context = node->context;
9291
rmw_ret_t ret = rmw_fastrtps_shared_cpp::__rmw_destroy_node(
9392
eprosima_fastrtps_identifier, node);

rmw_fastrtps_shared_cpp/src/rmw_node.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,15 @@ __rmw_destroy_node(
134134
{
135135
assert(node != nullptr);
136136
assert(node->implementation_identifier == identifier);
137-
static_cast<void>(identifier);
138137

139-
assert(node->context != nullptr);
140-
assert(node->context->impl != nullptr);
141-
assert(node->context->impl->common != nullptr);
142138
auto common_context = static_cast<rmw_dds_common::Context *>(node->context->impl->common);
143139
rmw_dds_common::GraphCache & graph_cache = common_context->graph_cache;
144140
{
145141
std::lock_guard<std::mutex> guard(common_context->node_update_mutex);
146142
rmw_dds_common::msg::ParticipantEntitiesInfo participant_msg =
147143
graph_cache.remove_node(common_context->gid, node->name, node->namespace_);
148144
rmw_ret_t ret = __rmw_publish(
149-
node->implementation_identifier,
145+
identifier,
150146
common_context->pub,
151147
static_cast<void *>(&participant_msg),
152148
nullptr);

0 commit comments

Comments
 (0)