Skip to content

Commit

Permalink
Enable manual_by_node and node liveliness assertion (#298)
Browse files Browse the repository at this point in the history
Signed-off-by: Emerson Knapp <eknapp@amazon.com>
  • Loading branch information
emersonknapp authored and jacobperron committed Jul 2, 2019
1 parent 419857d commit f8aec9b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
6 changes: 1 addition & 5 deletions rmw_fastrtps_shared_cpp/src/qos.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,8 @@ get_datawriter_qos(
}

bool
is_valid_qos(const rmw_qos_profile_t & qos_policies)
is_valid_qos(const rmw_qos_profile_t & /* qos_policies */)
{
if (qos_policies.liveliness == RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_NODE) {
RMW_SET_ERROR_MSG("Liveliness policy MANUAL_BY_NODE is not yet supported for fastrtps.");
return false;
}
return true;
}

Expand Down
6 changes: 2 additions & 4 deletions rmw_fastrtps_shared_cpp/src/rmw_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -386,10 +386,8 @@ __rmw_node_assert_liveliness(
return RMW_RET_ERROR;
}

// node_info->participant->assert_liveliness();
RMW_SET_ERROR_MSG("assert_liveliness() of node is currently not supported");

return RMW_RET_UNSUPPORTED;
node_info->participant->assert_liveliness();
return RMW_RET_OK;
}

const rmw_guard_condition_t *
Expand Down

0 comments on commit f8aec9b

Please sign in to comment.