Merge pull request OpenDDS#4470 from mitza-oci/master

Removed second ; when a statement ends in ;;
mitza-oci · Feb 9, 2024 · 26b946f · 26b946f
2 parents c49bb54 + 6a118c1
commit 26b946f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dds/DCPS/NetworkResource.cpp b/dds/DCPS/NetworkResource.cpp
@@ -826,7 +826,7 @@ ACE_INET_Addr choose_single_coherent_address(const String& address, bool prefer_
       addr.in6_.sin6_port = ACE_NTOHS(port_number);
     } else {
 #endif /* ACE_HAS_IPV6 */
-      addr.in4_.sin_port = ACE_NTOHS(port_number);;
+      addr.in4_.sin_port = ACE_NTOHS(port_number);
 #ifdef ACE_HAS_IPV6
     }
 #endif /* ACE_HAS_IPV6 */

diff --git a/dds/DCPS/RTPS/ICE/Stun.h b/dds/DCPS/RTPS/ICE/Stun.h
@@ -126,7 +126,7 @@ OpenDDS_Rtps_Export
 Attribute make_priority(ACE_UINT32 priority);
 
 OpenDDS_Rtps_Export
-Attribute make_use_candidate();;
+Attribute make_use_candidate();
 
 OpenDDS_Rtps_Export
 Attribute make_fingerprint();

diff --git a/dds/DCPS/XTypes/DynamicDataXcdrReadImpl.cpp b/dds/DCPS/XTypes/DynamicDataXcdrReadImpl.cpp
@@ -931,7 +931,7 @@ DDS::MemberDescriptor* DynamicDataXcdrReadImpl::get_union_selected_member()
   }
 
   if (has_default) {
-    return default_member._retn();;
+    return default_member._retn();
   }
 
   // The union has no selected member.

diff --git a/dds/DCPS/transport/shmem/ShmemTransport.cpp b/dds/DCPS/transport/shmem/ShmemTransport.cpp
@@ -329,7 +329,7 @@ ShmemTransport::ReadTask::stop()
   }
   stopped_ = true;
   ACE_OS::sema_post(&semaphore_);
-  ThreadStatusManager::Sleeper s(TheServiceParticipant->get_thread_status_manager());;
+  ThreadStatusManager::Sleeper s(TheServiceParticipant->get_thread_status_manager());
   wait();
 }
 

diff --git a/tests/unit-tests/dds/DCPS/Qos_Helper.cpp b/tests/unit-tests/dds/DCPS/Qos_Helper.cpp
@@ -213,35 +213,35 @@ TEST(dds_DCPS_Qos_Helper, DurabilityQosPolicyBuilder_kind)
 {
   OpenDDS::DCPS::DurabilityQosPolicyBuilder uut;
   uut.kind(DDS::TRANSIENT_DURABILITY_QOS);
-  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_DURABILITY_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_DURABILITY_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, DurabilityQosPolicyBuilder_volatile)
 {
   OpenDDS::DCPS::DurabilityQosPolicyBuilder uut;
   uut._volatile();
-  EXPECT_EQ(uut.qos().kind, DDS::VOLATILE_DURABILITY_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::VOLATILE_DURABILITY_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, DurabilityQosPolicyBuilder_transient_local)
 {
   OpenDDS::DCPS::DurabilityQosPolicyBuilder uut;
   uut.transient_local();
-  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_LOCAL_DURABILITY_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_LOCAL_DURABILITY_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, DurabilityQosPolicyBuilder_transient)
 {
   OpenDDS::DCPS::DurabilityQosPolicyBuilder uut;
   uut.transient();
-  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_DURABILITY_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::TRANSIENT_DURABILITY_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, DurabilityQosPolicyBuilder_persistent)
 {
   OpenDDS::DCPS::DurabilityQosPolicyBuilder uut;
   uut.persistent();
-  EXPECT_EQ(uut.qos().kind, DDS::PERSISTENT_DURABILITY_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::PERSISTENT_DURABILITY_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, DurabilityServiceQosPolicyBuilder_default_ctor)
@@ -421,14 +421,14 @@ TEST(dds_DCPS_Qos_Helper, OwnershipQosPolicyBuilder_shared)
 {
   OpenDDS::DCPS::OwnershipQosPolicyBuilder uut;
   uut.shared();
-  EXPECT_EQ(uut.qos().kind, DDS::SHARED_OWNERSHIP_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::SHARED_OWNERSHIP_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, OwnershipQosPolicyBuilder_exclusive)
 {
   OpenDDS::DCPS::OwnershipQosPolicyBuilder uut;
   uut.exclusive();
-  EXPECT_EQ(uut.qos().kind, DDS::EXCLUSIVE_OWNERSHIP_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::EXCLUSIVE_OWNERSHIP_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, OwnershipStrengthQosPolicyBuilder_default_ctor)
@@ -494,14 +494,14 @@ TEST(dds_DCPS_Qos_Helper, LivelinessQosPolicyBuilder_manual_by_participant)
 {
   OpenDDS::DCPS::LivelinessQosPolicyBuilder uut;
   uut.manual_by_participant();
-  EXPECT_EQ(uut.qos().kind, DDS::MANUAL_BY_PARTICIPANT_LIVELINESS_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::MANUAL_BY_PARTICIPANT_LIVELINESS_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, LivelinessQosPolicyBuilder_manual_by_topic)
 {
   OpenDDS::DCPS::LivelinessQosPolicyBuilder uut;
   uut.manual_by_topic();
-  EXPECT_EQ(uut.qos().kind, DDS::MANUAL_BY_TOPIC_LIVELINESS_QOS);;
+  EXPECT_EQ(uut.qos().kind, DDS::MANUAL_BY_TOPIC_LIVELINESS_QOS);
 }
 
 TEST(dds_DCPS_Qos_Helper, LivelinessQosPolicyBuilder_lease_duration)