From c8a500f5a8ebafe3f7832545f97d2f66f65c0bfc Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 7 Nov 2018 16:54:53 +0300 Subject: [PATCH] Remove duplicate semicolons --- examples/routing/global-injection-slash32.cc | 2 +- examples/routing/global-routing-slash32.cc | 2 +- examples/routing/static-routing-slash32.cc | 2 +- .../model/hybrid-buildings-propagation-loss-model.cc | 2 +- src/buildings/model/oh-buildings-propagation-loss-model.cc | 2 +- src/core/model/default-simulator-impl.h | 4 ++-- src/core/model/realtime-simulator-impl.h | 4 ++-- src/core/model/unix-system-condition.cc | 2 +- src/core/test/attribute-test-suite.cc | 2 +- src/internet/model/global-router-interface.cc | 2 +- src/internet/model/icmpv6-l4-protocol.h | 4 ++-- src/internet/model/ipv4-static-routing.cc | 2 +- src/internet/model/ndisc-cache.cc | 2 +- src/lte/test/lte-test-entities.cc | 2 +- src/mpi/model/distributed-simulator-impl.h | 2 +- src/mpi/model/null-message-simulator-impl.h | 2 +- src/network/test/packet-test-suite.cc | 2 +- src/visualizer/model/visual-simulator-impl.h | 4 ++-- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index 572420b16..4044a1d41 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -78,7 +78,7 @@ main (int argc, char *argv[]) p2p.SetChannelAttribute ("Delay", StringValue ("2ms")); NetDeviceContainer dAdB = p2p.Install (nAnB); - NetDeviceContainer dBdC = p2p.Install (nBnC);; + NetDeviceContainer dBdC = p2p.Install (nBnC); Ptr deviceA = CreateObject (); deviceA->SetAddress (Mac48Address::Allocate ()); diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index c8ee02c49..daf430b07 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/examples/routing/global-routing-slash32.cc @@ -64,7 +64,7 @@ main (int argc, char *argv[]) p2p.SetChannelAttribute ("Delay", StringValue ("2ms")); NetDeviceContainer dAdB = p2p.Install (nAnB); - NetDeviceContainer dBdC = p2p.Install (nBnC);; + NetDeviceContainer dBdC = p2p.Install (nBnC); Ptr deviceA = CreateObject (); deviceA->SetAddress (Mac48Address::Allocate ()); diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 8850cd6ef..d0f429acd 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/examples/routing/static-routing-slash32.cc @@ -64,7 +64,7 @@ main (int argc, char *argv[]) p2p.SetChannelAttribute ("Delay", StringValue ("2ms")); NetDeviceContainer dAdB = p2p.Install (nAnB); - NetDeviceContainer dBdC = p2p.Install (nBnC);; + NetDeviceContainer dBdC = p2p.Install (nBnC); Ptr deviceA = CreateObject (); deviceA->SetAddress (Mac48Address::Allocate ()); diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc index 9fb13439e..64656e140 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc +++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc @@ -213,7 +213,7 @@ HybridBuildingsPropagationLossModel::GetLoss (Ptr a, PtrGetBuilding () == b1->GetBuilding ()) { // nodes are in same building -> indoor communication ITU-R P.1238 - loss = ItuR1238 (a, b) + InternalWallsLoss (a1, b1);; + loss = ItuR1238 (a, b) + InternalWallsLoss (a1, b1); NS_LOG_INFO (this << " I-I (same building) ITUR1238 : " << loss); } diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc index a4b953a1d..65b752aa8 100644 --- a/src/buildings/model/oh-buildings-propagation-loss-model.cc +++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc @@ -96,7 +96,7 @@ OhBuildingsPropagationLossModel::GetLoss (Ptr a, PtrGetBuilding () == b1->GetBuilding ()) { // nodes are in same building -> indoor communication ITU-R P.1238 - loss = m_okumuraHata->GetLoss (a, b) + InternalWallsLoss (a1, b1);; + loss = m_okumuraHata->GetLoss (a, b) + InternalWallsLoss (a1, b1); NS_LOG_INFO (this << " I-I (same building)" << loss); } diff --git a/src/core/model/default-simulator-impl.h b/src/core/model/default-simulator-impl.h index 51aca96e9..918b7e1af 100644 --- a/src/core/model/default-simulator-impl.h +++ b/src/core/model/default-simulator-impl.h @@ -75,9 +75,9 @@ public: virtual Time GetDelayLeft (const EventId &id) const; virtual Time GetMaximumSimulationTime (void) const; virtual void SetScheduler (ObjectFactory schedulerFactory); - virtual uint32_t GetSystemId (void) const; + virtual uint32_t GetSystemId (void) const; virtual uint32_t GetContext (void) const; - virtual uint64_t GetEventCount (void) const;; + virtual uint64_t GetEventCount (void) const; private: virtual void DoDispose (void); diff --git a/src/core/model/realtime-simulator-impl.h b/src/core/model/realtime-simulator-impl.h index 6e78d2a7e..3e9c21d97 100644 --- a/src/core/model/realtime-simulator-impl.h +++ b/src/core/model/realtime-simulator-impl.h @@ -105,9 +105,9 @@ public: virtual Time GetDelayLeft (const EventId &id) const; virtual Time GetMaximumSimulationTime (void) const; virtual void SetScheduler (ObjectFactory schedulerFactory); - virtual uint32_t GetSystemId (void) const; + virtual uint32_t GetSystemId (void) const; virtual uint32_t GetContext (void) const; - virtual uint64_t GetEventCount (void) const;; + virtual uint64_t GetEventCount (void) const; /** \copydoc ScheduleWithContext(uint32_t,const Time&,EventImpl*) */ void ScheduleRealtimeWithContext (uint32_t context, const Time &delay, EventImpl *event); diff --git a/src/core/model/unix-system-condition.cc b/src/core/model/unix-system-condition.cc index 9bfd91b3c..2561f3baa 100644 --- a/src/core/model/unix-system-condition.cc +++ b/src/core/model/unix-system-condition.cc @@ -208,7 +208,7 @@ SystemConditionPrivate::TimedWait (uint64_t ns) SystemCondition::SystemCondition() : m_priv (new SystemConditionPrivate ()) { - NS_LOG_FUNCTION (this);; + NS_LOG_FUNCTION (this); } SystemCondition::~SystemCondition () diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index e180635da..2941b5124 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -557,7 +557,7 @@ AttributeTestCase::DoRun (void) // value. // ok = CheckGetCodePaths (p, "TestUint8", "1", UintegerValue (1)); - NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by default value");; + NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by default value"); // // Set the Attribute to zero. diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index ab5ff9c1f..9fa6b12c8 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -910,7 +910,7 @@ GlobalRouter::ProcessBridgedBroadcastLink (Ptr nd, GlobalRoutingLSA * NS_LOG_WARN ("Warning, interface has multiple IP addresses; using only the primary one"); } Ipv4Address addrLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetLocal (); - Ipv4Mask maskLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetMask ();; + Ipv4Mask maskLocal = ipv4Local->GetAddress (interfaceLocal, 0).GetMask (); NS_LOG_LOGIC ("Working with local address " << addrLocal); uint16_t metricLocal = ipv4Local->GetMetric (interfaceLocal); diff --git a/src/internet/model/icmpv6-l4-protocol.h b/src/internet/model/icmpv6-l4-protocol.h index ed853ae14..0c76c19bd 100644 --- a/src/internet/model/icmpv6-l4-protocol.h +++ b/src/internet/model/icmpv6-l4-protocol.h @@ -73,13 +73,13 @@ public: * \brief Neighbor Discovery node constants: max unicast solicitations. * \returns The max unicast solicitations number. */ - uint8_t GetMaxUnicastSolicit () const;; + uint8_t GetMaxUnicastSolicit () const; /** * \brief Neighbor Discovery node constants: reachable time. * \returns The Reachable time for an Neighbor cache entry. */ - Time GetReachableTime () const;; + Time GetReachableTime () const; /** * \brief Neighbor Discovery node constants: retransmission timer. diff --git a/src/internet/model/ipv4-static-routing.cc b/src/internet/model/ipv4-static-routing.cc index 2fcb4d236..71f5ec751 100644 --- a/src/internet/model/ipv4-static-routing.cc +++ b/src/internet/model/ipv4-static-routing.cc @@ -357,7 +357,7 @@ uint32_t Ipv4StaticRouting::GetNRoutes (void) const { NS_LOG_FUNCTION (this); - return m_networkRoutes.size ();; + return m_networkRoutes.size (); } Ipv4RoutingTableEntry diff --git a/src/internet/model/ndisc-cache.cc b/src/internet/model/ndisc-cache.cc index ebf189791..51834e79f 100644 --- a/src/internet/model/ndisc-cache.cc +++ b/src/internet/model/ndisc-cache.cc @@ -281,7 +281,7 @@ void NdiscCache::Entry::FunctionRetransmitTimeout () /* determine source address */ if (m_ipv6Address.IsLinkLocal ()) { - addr = m_ndCache->GetInterface ()->GetLinkLocalAddress ().GetAddress ();; + addr = m_ndCache->GetInterface ()->GetLinkLocalAddress ().GetAddress (); } else if (!m_ipv6Address.IsAny ()) { diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc index ace84a614..5082d6260 100644 --- a/src/lte/test/lte-test-entities.cc +++ b/src/lte/test/lte-test-entities.cc @@ -54,7 +54,7 @@ LteTestRrc::LteTestRrc () m_rxPdus = 0; m_rxBytes = 0; m_txLastTime = Time (0); - m_rxLastTime = Time (0);; + m_rxLastTime = Time (0); m_pdcpSapUser = new LtePdcpSpecificLtePdcpSapUser (this); // Simulator::ScheduleNow (&LteTestRrc::Start, this); diff --git a/src/mpi/model/distributed-simulator-impl.h b/src/mpi/model/distributed-simulator-impl.h index 1031a15e0..816265122 100644 --- a/src/mpi/model/distributed-simulator-impl.h +++ b/src/mpi/model/distributed-simulator-impl.h @@ -126,7 +126,7 @@ public: virtual void SetScheduler (ObjectFactory schedulerFactory); virtual uint32_t GetSystemId (void) const; virtual uint32_t GetContext (void) const; - virtual uint64_t GetEventCount (void) const;; + virtual uint64_t GetEventCount (void) const; private: virtual void DoDispose (void); diff --git a/src/mpi/model/null-message-simulator-impl.h b/src/mpi/model/null-message-simulator-impl.h index 55c02c983..c0e0eb69a 100644 --- a/src/mpi/model/null-message-simulator-impl.h +++ b/src/mpi/model/null-message-simulator-impl.h @@ -71,7 +71,7 @@ public: virtual void SetScheduler (ObjectFactory schedulerFactory); virtual uint32_t GetSystemId (void) const; virtual uint32_t GetContext (void) const; - virtual uint64_t GetEventCount (void) const;; + virtual uint64_t GetEventCount (void) const; /** * \return singleton instance diff --git a/src/network/test/packet-test-suite.cc b/src/network/test/packet-test-suite.cc index 4012e3225..d296e30e6 100644 --- a/src/network/test/packet-test-suite.cc +++ b/src/network/test/packet-test-suite.cc @@ -910,7 +910,7 @@ PacketTagListTest::DoRun (void) { // Peek std::cout << GetName () << "check Peek (missing tag) returns false" - << std::endl;; + << std::endl; ATestTag<10> t10; NS_TEST_EXPECT_MSG_EQ (ref.Peek (t10), false, "missing tag"); } diff --git a/src/visualizer/model/visual-simulator-impl.h b/src/visualizer/model/visual-simulator-impl.h index a8adf8ab8..b28906104 100644 --- a/src/visualizer/model/visual-simulator-impl.h +++ b/src/visualizer/model/visual-simulator-impl.h @@ -69,9 +69,9 @@ public: virtual Time GetDelayLeft (const EventId &id) const; virtual Time GetMaximumSimulationTime (void) const; virtual void SetScheduler (ObjectFactory schedulerFactory); - virtual uint32_t GetSystemId (void) const; + virtual uint32_t GetSystemId (void) const; virtual uint32_t GetContext (void) const; - virtual uint64_t GetEventCount (void) const;; + virtual uint64_t GetEventCount (void) const; /// calls Run() in the wrapped simulator void RunRealSimulator (void);