Migrates remaining proxies to generated rtiddsgen API
Converts accessor calls to plain member access in bld, cmo, gna, hla, whg and wls.
This commit is contained in:
34 files changed
+218
-214
No files matched your search
@@ -107,9 +107,9 @@ int Participant2Dds::partyId(int participantId) const
|
||||
auto ret = -1;
|
||||
std::function<bool(const ParticipantManagement::Participant&)> cb = [participantId, &ret](const ParticipantManagement::Participant &p)
|
||||
{
|
||||
if (p.id() != participantId)
|
||||
if (p.id != participantId)
|
||||
return false;
|
||||
ret = p.partyId();
|
||||
ret = p.partyId;
|
||||
return true;
|
||||
};
|
||||
m_ppmDtc->participants(cb);
|
||||
@@ -120,15 +120,15 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
|
||||
{
|
||||
if (modType == DataModification::eRemoved)
|
||||
return;
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id()
|
||||
<< ", " << m_participantsToWatch.contains(data.id())
|
||||
DEBUG_LOG(m_logger) << "onParticipantChanged: " << data.id
|
||||
<< ", " << m_participantsToWatch.contains(data.id)
|
||||
<< ", " << m_participantsToWatch.size()
|
||||
<< ", " << m_participantsToWatch.contains(data.id())
|
||||
<< ", " << data.isDeleted();
|
||||
if (!m_participantsToWatch.contains(data.id()))
|
||||
<< ", " << m_participantsToWatch.contains(data.id)
|
||||
<< ", " << data.isDeleted;
|
||||
if (!m_participantsToWatch.contains(data.id))
|
||||
return;
|
||||
if (data.isDeleted())
|
||||
emit participantRemoved(m_ddsConnector->getPartitionId(), data.id());
|
||||
if (data.isDeleted)
|
||||
emit participantRemoved(m_ddsConnector->getPartitionId(), data.id);
|
||||
}
|
||||
|
||||
|
||||
@@ -137,6 +137,7 @@ void Participant2Dds::onParticipantChanged(const ParticipantManagement::Particip
|
||||
|
||||
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
: m_ddsConnector(std::make_shared<DDSConnector::DdsConnector>(ddsConnector->getDomainParticipant(), IDL::PartitionType::AllExercises))
|
||||
, m_logger(getLogger("DdsHandler"))
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "DdsHandler(" << m_ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user