From 8b65e414b2518fb53fdb67e43bdd0ee8c1e7135b Mon Sep 17 00:00:00 2001 From: jose_morato Date: Fri, 28 Jun 2024 09:17:56 +0200 Subject: [PATCH] Use getters and setters functions --- .../Tasks/PrepareLinuxLibraries.cs | 4 +-- Native/OpenDDSWrapper/MulticastInst.cpp | 20 ++++++------ Native/OpenDDSWrapper/RtpsUdpInst.cpp | 32 +++++++++---------- Native/OpenDDSWrapper/ShmemInst.cpp | 8 ++--- Native/OpenDDSWrapper/TcpInst.cpp | 26 +++++++-------- Native/OpenDDSWrapper/UdpInst.cpp | 8 ++--- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs b/Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs index 75c44484..7edafd12 100644 --- a/Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs +++ b/Build/OpenDDSharp.Build/Tasks/PrepareLinuxLibraries.cs @@ -30,8 +30,8 @@ namespace OpenDDSharp.Build.Tasks public class PrepareLinuxLibraries : FrostingTask { private const string OPENDDS_VERSION = "3.28.1"; - private const string ACE_VERSION = "7.1.1"; - private const string TAO_VERSION = "3.1.1"; + private const string ACE_VERSION = "7.1.3"; + private const string TAO_VERSION = "3.1.3"; private readonly string[] _aceLibraries = { diff --git a/Native/OpenDDSWrapper/MulticastInst.cpp b/Native/OpenDDSWrapper/MulticastInst.cpp index f7b2881f..69052597 100644 --- a/Native/OpenDDSWrapper/MulticastInst.cpp +++ b/Native/OpenDDSWrapper/MulticastInst.cpp @@ -33,31 +33,31 @@ CORBA::Boolean MulticastInst_GetIsReliable(::OpenDDS::DCPS::MulticastInst *mi) { } CORBA::Boolean MulticastInst_GetReliable(::OpenDDS::DCPS::MulticastInst *mi) { - return mi->reliable_.get(); + return mi->reliable(); } void MulticastInst_SetReliable(::OpenDDS::DCPS::MulticastInst *mi, CORBA::Boolean value) { - mi->reliable_ = value; + mi->reliable(value); } CORBA::Boolean MulticastInst_GetDefaultToIpv6(::OpenDDS::DCPS::MulticastInst *mi) { - return mi->default_to_ipv6_.get(); + return mi->default_to_ipv6(); } void MulticastInst_SetDefaultToIpv6(::OpenDDS::DCPS::MulticastInst *mi, CORBA::Boolean value) { - mi->default_to_ipv6_ = value; + mi->default_to_ipv6(value); } CORBA::UShort MulticastInst_GetPortOffset(::OpenDDS::DCPS::MulticastInst *mi) { - return mi->port_offset_.get(); + return mi->port_offset(); } void MulticastInst_SetPortOffset(::OpenDDS::DCPS::MulticastInst *mi, CORBA::UShort value) { - mi->port_offset_ = value; + mi->port_offset(value); } char *MulticastInst_GetGroupAddress(::OpenDDS::DCPS::MulticastInst *mi) { - const char* addr_str = ::OpenDDS::DCPS::LogAddr(mi->group_address_.get()).c_str(); + const char* addr_str = ::OpenDDS::DCPS::LogAddr(mi->group_address()).c_str(); if (addr_str == NULL) { return CORBA::string_dup(""); } @@ -78,15 +78,15 @@ char *MulticastInst_GetLocalAddress(::OpenDDS::DCPS::MulticastInst *mi) { } void MulticastInst_SetLocalAddress(::OpenDDS::DCPS::MulticastInst *mi, char *value) { - mi->local_address_ = value; + mi->local_address(value); } CORBA::Double MulticastInst_GetSynBackoff(::OpenDDS::DCPS::MulticastInst *mi) { - return mi->syn_backoff_.get(); + return mi->syn_backoff(); } void MulticastInst_SetSynBackoff(::OpenDDS::DCPS::MulticastInst *mi, CORBA::Double value) { - mi->syn_backoff_ = value; + mi->syn_backoff(value); } TimeValueWrapper MulticastInst_GetSynInterval(::OpenDDS::DCPS::MulticastInst *mi) { diff --git a/Native/OpenDDSWrapper/RtpsUdpInst.cpp b/Native/OpenDDSWrapper/RtpsUdpInst.cpp index 8c9b03c3..d3eb3b63 100644 --- a/Native/OpenDDSWrapper/RtpsUdpInst.cpp +++ b/Native/OpenDDSWrapper/RtpsUdpInst.cpp @@ -41,39 +41,39 @@ CORBA::Int32 RtpsUdpInst_GetSendBufferSize(::OpenDDS::DCPS::RtpsUdpInst *ri) { } void RtpsUdpInst_SetSendBufferSize(::OpenDDS::DCPS::RtpsUdpInst *ri, CORBA::Int32 value) { - ri->send_buffer_size_ = value; + ri->send_buffer_size(value); } CORBA::Int32 RtpsUdpInst_GetRcvBufferSize(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->rcv_buffer_size_.get(); + return ri->rcv_buffer_size(); } void RtpsUdpInst_SetRcvBufferSize(::OpenDDS::DCPS::RtpsUdpInst *ri, CORBA::Int32 value) { - ri->rcv_buffer_size_ = value; + ri->rcv_buffer_size(value); } size_t RtpsUdpInst_GetNakDepth(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->nak_depth_.get(); + return ri->nak_depth(); } void RtpsUdpInst_SetNakDepth(::OpenDDS::DCPS::RtpsUdpInst *ri, size_t value) { - ri->nak_depth_ = value; + ri->nak_depth(value); } CORBA::Boolean RtpsUdpInst_GetUseMulticast(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->use_multicast_.get(); + return ri->use_multicast(); } void RtpsUdpInst_SetUseMulticast(::OpenDDS::DCPS::RtpsUdpInst *ri, CORBA::Boolean value) { - ri->use_multicast_ = value; + ri->use_multicast(value); } CORBA::Octet RtpsUdpInst_GetTtl(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->ttl_.get(); + return ri->ttl(); } void RtpsUdpInst_SetTtl(::OpenDDS::DCPS::RtpsUdpInst *ri, CORBA::Octet value) { - ri->ttl_ = value; + ri->ttl(value); } char *RtpsUdpInst_GetMulticastGroupAddress(::OpenDDS::DCPS::RtpsUdpInst *ri, int domain_id) { @@ -95,7 +95,7 @@ char *RtpsUdpInst_GetMulticastInterface(::OpenDDS::DCPS::RtpsUdpInst *ri) { } void RtpsUdpInst_SetMulticastInterface(::OpenDDS::DCPS::RtpsUdpInst *ri, char *value) { - ri->multicast_interface_ = value; + ri->multicast_interface(value); } char *RtpsUdpInst_GetLocalAddress(::OpenDDS::DCPS::RtpsUdpInst *ri) { @@ -112,25 +112,25 @@ void RtpsUdpInst_SetLocalAddress(::OpenDDS::DCPS::RtpsUdpInst *ri, char *value) } TimeValueWrapper RtpsUdpInst_GetNakResponseDelay(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->nak_response_delay_.get(); + return ri->nak_response_delay(); } void RtpsUdpInst_SetNakResponseDelay(::OpenDDS::DCPS::RtpsUdpInst *ri, TimeValueWrapper value) { - ri->nak_response_delay_ = value; + ri->nak_response_delay(value); } TimeValueWrapper RtpsUdpInst_GetHeartbeatPeriod(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->heartbeat_period_.get(); + return ri->heartbeat_period(); } void RtpsUdpInst_SetHeartbeatPeriod(::OpenDDS::DCPS::RtpsUdpInst *ri, TimeValueWrapper value) { - ri->heartbeat_period_ = value; + ri->heartbeat_period(value); } TimeValueWrapper RtpsUdpInst_GetReceiveAddressDuration(::OpenDDS::DCPS::RtpsUdpInst *ri) { - return ri->receive_address_duration_.get(); + return ri->receive_address_duration(); } void RtpsUdpInst_SetReceiveAddressDuration(::OpenDDS::DCPS::RtpsUdpInst *ri, TimeValueWrapper value) { - ri->receive_address_duration_ = value; + ri->receive_address_duration(value); } \ No newline at end of file diff --git a/Native/OpenDDSWrapper/ShmemInst.cpp b/Native/OpenDDSWrapper/ShmemInst.cpp index daa1251e..c90a522d 100644 --- a/Native/OpenDDSWrapper/ShmemInst.cpp +++ b/Native/OpenDDSWrapper/ShmemInst.cpp @@ -33,19 +33,19 @@ CORBA::Boolean ShmemInst_GetIsReliable(::OpenDDS::DCPS::ShmemInst *si) { } size_t ShmemInst_GetPoolSize(::OpenDDS::DCPS::ShmemInst *si) { - return si->pool_size_.get(); + return si->pool_size(); } void ShmemInst_SetPoolSize(::OpenDDS::DCPS::ShmemInst *si, size_t value) { - si->pool_size_ = value; + si->pool_size(value); } size_t ShmemInst_GetDatalinkControlSize(::OpenDDS::DCPS::ShmemInst *si) { - return si->datalink_control_size_.get(); + return si->datalink_control_size(); } void ShmemInst_SetDatalinkControlSize(::OpenDDS::DCPS::ShmemInst *si, size_t value) { - si->datalink_control_size_ = value; + si->datalink_control_size(value); } char *ShmemInst_GetHostName(::OpenDDS::DCPS::ShmemInst *si) { diff --git a/Native/OpenDDSWrapper/TcpInst.cpp b/Native/OpenDDSWrapper/TcpInst.cpp index 651b15e1..976f1166 100644 --- a/Native/OpenDDSWrapper/TcpInst.cpp +++ b/Native/OpenDDSWrapper/TcpInst.cpp @@ -33,51 +33,51 @@ CORBA::Boolean TcpInst_GetIsReliable(::OpenDDS::DCPS::TcpInst *ti) { } CORBA::Boolean TcpInst_GetEnableNagleAlgorithm(::OpenDDS::DCPS::TcpInst *ti) { - return ti->enable_nagle_algorithm_.get(); + return ti->enable_nagle_algorithm(); } void TcpInst_SetEnableNagleAlgorithm(::OpenDDS::DCPS::TcpInst *ti, CORBA::Boolean value) { - ti->enable_nagle_algorithm_ = value; + ti->enable_nagle_algorithm(value); } CORBA::Long TcpInst_GetConnRetryInitialDelay(::OpenDDS::DCPS::TcpInst *ti) { - return ti->conn_retry_initial_delay_.get(); + return ti->conn_retry_initial_delay(); } void TcpInst_SetConnRetryInitialDelay(::OpenDDS::DCPS::TcpInst *ti, CORBA::Long value) { - ti->conn_retry_initial_delay_ = value; + ti->conn_retry_initial_delay(value); } CORBA::Double TcpInst_GetConnRetryBackoffMultiplier(::OpenDDS::DCPS::TcpInst *ti) { - return ti->conn_retry_backoff_multiplier_.get(); + return ti->conn_retry_backoff_multiplier(); } void TcpInst_SetConnRetryBackoffMultiplier(::OpenDDS::DCPS::TcpInst *ti, CORBA::Double value) { - ti->conn_retry_backoff_multiplier_ = value; + ti->conn_retry_backoff_multiplier(value); } CORBA::Long TcpInst_GetConnRetryAttempts(::OpenDDS::DCPS::TcpInst *ti) { - return ti->conn_retry_attempts_.get(); + return ti->conn_retry_attempts(); } void TcpInst_SetConnRetryAttempts(::OpenDDS::DCPS::TcpInst *ti, CORBA::Long value) { - ti->conn_retry_attempts_ = value; + ti->conn_retry_attempts(value); } CORBA::Long TcpInst_GetMaxOutputPausePeriod(::OpenDDS::DCPS::TcpInst *ti) { - return ti->max_output_pause_period_.get(); + return ti->max_output_pause_period(); } void TcpInst_SetMaxOutputPausePeriod(::OpenDDS::DCPS::TcpInst *ti, CORBA::Long value) { - ti->max_output_pause_period_ = value; + ti->max_output_pause_period(value); } CORBA::Long TcpInst_GetPassiveReconnectDuration(::OpenDDS::DCPS::TcpInst *ti) { - return ti->passive_reconnect_duration_.get(); + return ti->passive_reconnect_duration(); } void TcpInst_SetPassiveReconnectDuration(::OpenDDS::DCPS::TcpInst *ti, CORBA::Long value) { - ti->passive_reconnect_duration_ = value; + ti->passive_reconnect_duration(value); } char *TcpInst_GetPublicAddress(::OpenDDS::DCPS::TcpInst *ti) { @@ -85,7 +85,7 @@ char *TcpInst_GetPublicAddress(::OpenDDS::DCPS::TcpInst *ti) { } void TcpInst_SetPublicAddress(::OpenDDS::DCPS::TcpInst *ti, char *value) { - ti->pub_address_str_ = value; + ti->pub_address_str(value); } char *TcpInst_GetLocalAddress(::OpenDDS::DCPS::TcpInst *ti) { diff --git a/Native/OpenDDSWrapper/UdpInst.cpp b/Native/OpenDDSWrapper/UdpInst.cpp index b4cec03f..d2ae5328 100644 --- a/Native/OpenDDSWrapper/UdpInst.cpp +++ b/Native/OpenDDSWrapper/UdpInst.cpp @@ -33,19 +33,19 @@ CORBA::Boolean UdpInst_GetIsReliable(::OpenDDS::DCPS::UdpInst *ui) { } CORBA::Int32 UdpInst_GetSendBufferSize(::OpenDDS::DCPS::UdpInst *ui) { - return ui->send_buffer_size_.get(); + return ui->send_buffer_size(); } void UdpInst_SetSendBufferSize(::OpenDDS::DCPS::UdpInst *ui, CORBA::Int32 value) { - ui->send_buffer_size_ = value; + ui->send_buffer_size(value); } CORBA::Int32 UdpInst_GetRcvBufferSize(::OpenDDS::DCPS::UdpInst *ui) { - return ui->rcv_buffer_size_.get(); + return ui->rcv_buffer_size(); } void UdpInst_SetRcvBufferSize(::OpenDDS::DCPS::UdpInst *ui, CORBA::Int32 value) { - ui->rcv_buffer_size_ = value; + ui->rcv_buffer_size(value); } char *UdpInst_GetLocalAddress(::OpenDDS::DCPS::UdpInst *ui) {