Skip to content

Commit

Permalink
Added patch for RtpsDiscoveryConfig
Browse files Browse the repository at this point in the history
  • Loading branch information
jmmorato committed Jun 27, 2024
1 parent 325f237 commit b066f39
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Build/OpenDDSharp.Build/Tasks/SetupThirdPartyTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public override void Run(BuildContext context)
var arguments = " -v --doc-group3 --no-test --no-debug --optimize --install-origin-relative --prefix=/usr/lib";
if (BuildContext.IsOSX)
{
arguments += " --std=c++11";
arguments += " --std=c++17";
}
context.Log.Information(arguments);

Expand Down
31 changes: 31 additions & 0 deletions Patches/RtpsDiscoveryConfig.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 476821173b736c5d3c99f87f92e78979389229e8 Mon Sep 17 00:00:00 2001
From: jose_morato <[email protected]>
Date: Thu, 27 Jun 2024 15:51:29 +0200
Subject: [PATCH] [fix] RtpsDiscoveryConfig RESEND_PERIOD

---
dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp b/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp
index cb31a6e9b4..2d9f9e25dc 100644
--- a/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp
+++ b/dds/DCPS/RTPS/RtpsDiscoveryConfig.cpp
@@ -32,7 +32,7 @@ RtpsDiscoveryConfig::resend_period() const
// see RTPS v2.1 9.6.1.4.2
return TheServiceParticipant->config_store()->get(config_key("RESEND_PERIOD").c_str(),
TimeDuration(30 /*seconds*/),
- DCPS::ConfigStoreImpl::Format_IntegerSeconds);
+ DCPS::ConfigStoreImpl::Format_IntegerMilliseconds);
}

void
@@ -40,7 +40,7 @@ RtpsDiscoveryConfig::resend_period(const DCPS::TimeDuration& period)
{
TheServiceParticipant->config_store()->set(config_key("RESEND_PERIOD").c_str(),
period,
- DCPS::ConfigStoreImpl::Format_IntegerSeconds);
+ DCPS::ConfigStoreImpl::Format_IntegerMilliseconds);
}

double

0 comments on commit b066f39

Please sign in to comment.