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

[21120] Fix EDP build warning wihtout security #4932

Merged
merged 2 commits into from
Jun 12, 2024
Merged

[21120] Fix EDP build warning wihtout security #4932

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
291ed04
Refs #21120: Fix build warning wihtout security
JesusPoderoso Jun 11, 2024
a7cada7
Refs #21120: Fix build when no sec and no log infos
EduPonz Jun 12, 2024
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
3 changes: 2 additions & 1 deletion src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ bool EDP::unpairWriterProxy(
{
if (r.matched_writer_remove(writer_guid, removed_by_lease))
{
const GUID_t& reader_guid = r.getGuid();
#if HAVE_SECURITY
const GUID_t& reader_guid = r.getGuid();
mp_RTPSParticipant->security_manager().remove_writer(reader_guid,
participant_guid, writer_guid);
#endif // if HAVE_SECURITY
Expand Down Expand Up @@ -854,6 +854,7 @@ bool EDP::pairingReader(
#else
if (R->matched_writer_add(*wdatait))
{
static_cast<void>(reader_guid); // Void cast to force usage if we don't have LOG_INFOs
EPROSIMA_LOG_INFO(RTPS_EDP_MATCH,
"WP:" << wdatait->guid() << " match R:" << reader_guid << ". RLoc:" <<
wdatait->remote_locators());
Expand Down