yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 09:22:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix FastRTPSGen version verification

Browse Source
This commit is contained in:
TSC21
2019-10-02 15:00:01 +01:00
committed by Nuno Marques
parent 9c00f3de02
commit e7b0384f05
7 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
msg/templates/urtps/Subscriber.cpp.em
View File

@@ -75,7 +75,7 @@ bool @(topic)_Subscriber::init()
// Create RTPSParticipant
ParticipantAttributes PParam;
PParam.rtps.builtin.domainId = 0; // MUST BE THE SAME AS IN THE PUBLISHER
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
PParam.rtps.builtin.leaseDuration = c_TimeInfinite;
@[else]@
PParam.rtps.builtin.discovery_config.leaseDuration = c_TimeInfinite;
@@ -92,7 +92,7 @@ bool @(topic)_Subscriber::init()
SubscriberAttributes Rparam;
Rparam.topic.topicKind = NO_KEY;
Rparam.topic.topicDataType = myType.getName(); //Must be registered before the creation of the subscriber
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
Rparam.topic.topicName = "@(topic)_PubSubTopic";
@[else]@
Rparam.topic.topicName = "@(topic)PubSubTopic";
@@ -125,7 +125,7 @@ void @(topic)_Subscriber::SubListener::onSubscriptionMatched(Subscriber* sub, Ma
void @(topic)_Subscriber::SubListener::onNewDataMessage(Subscriber* sub)
{
// Take data
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
@(topic)_ st;
@[else]@
@(topic) st;
@@ -156,7 +156,7 @@ bool @(topic)_Subscriber::hasMsg()
return m_listener.has_msg;
}
@[if 1.5 < fastrtpsgen_version <= 1.7]@
@[if 1.5 <= fastrtpsgen_version <= 1.7]@
@(topic)_ @(topic)_Subscriber::getMsg()
@[else]@
@(topic) @(topic)_Subscriber::getMsg()