From 820ad760b84246ad40d6d6667a9d347e309cd5c6 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Thu, 29 Sep 2022 20:06:57 +0100 Subject: [PATCH] Fix clang-tidy readability-redundant-control-flow warnings --- .../socket/socket-bound-static-routing.cc | 2 -- .../socket/socket-bound-tcp-static-routing.cc | 1 - src/aodv/model/aodv-rqueue.cc | 1 - src/core/model/trickle-timer.cc | 4 --- src/dsdv/model/dsdv-packet-queue.cc | 1 - src/dsdv/model/dsdv-rtable.cc | 1 - src/dsr/model/dsr-errorbuff.cc | 2 -- src/dsr/model/dsr-passive-buff.cc | 2 -- src/dsr/model/dsr-rcache.cc | 1 - src/dsr/model/dsr-routing.cc | 1 - src/dsr/model/dsr-rsendbuff.cc | 1 - src/internet/model/ipv4-address-generator.cc | 1 - src/internet/model/ipv4-end-point.cc | 1 - src/internet/model/ipv4-l3-protocol.cc | 7 ----- src/internet/model/ipv6-address-generator.cc | 1 - src/internet/model/ipv6-end-point.cc | 1 - src/internet/model/ipv6-extension.cc | 3 -- src/internet/model/ipv6-l3-protocol.cc | 1 - src/internet/model/rip.cc | 1 - src/internet/model/ripng.cc | 1 - src/internet/model/rtt-estimator.cc | 2 -- src/internet/model/tcp-socket-base.cc | 2 -- src/internet/model/udp-socket-impl.cc | 2 -- .../test/ipv6-dual-stack-test-suite.cc | 6 ---- src/lr-wpan/helper/lr-wpan-helper.cc | 2 -- src/lte/model/cqa-ff-mac-scheduler.cc | 28 ----------------- src/lte/model/fdbet-ff-mac-scheduler.cc | 30 ------------------- src/lte/model/fdmt-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/fdtbfq-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/lte-asn1-header.cc | 1 - src/lte/model/lte-ffr-enhanced-algorithm.cc | 2 -- src/lte/model/pf-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/pss-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/rr-ff-mac-scheduler.cc | 25 ---------------- src/lte/model/tdbet-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/tdmt-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/tdtbfq-ff-mac-scheduler.cc | 29 ------------------ src/lte/model/tta-ff-mac-scheduler.cc | 29 ------------------ src/netanim/model/animation-interface.cc | 1 - src/network/model/socket.cc | 1 - src/network/test/packetbb-test-suite.cc | 1 - src/network/utils/packetbb.cc | 2 -- src/network/utils/simple-net-device.cc | 2 -- src/sixlowpan/model/sixlowpan-header.cc | 2 -- src/sixlowpan/model/sixlowpan-net-device.cc | 12 -------- src/topology-read/model/topology-reader.cc | 1 - src/wifi/test/wifi-phy-ofdma-test.cc | 1 - 47 files changed, 389 deletions(-) diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc index 8f3f0f594..55e00585a 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/examples/socket/socket-bound-static-routing.cc @@ -177,13 +177,11 @@ void SendStuff (Ptr sock, Ipv4Address dstaddr, uint16_t port) Ptr p = Create (); p->AddPaddingAtEnd (100); sock->SendTo (p, 0, InetSocketAddress (dstaddr,port)); - return; } void BindSock (Ptr sock, Ptr netdev) { sock->BindToNetDevice (netdev); - return; } void diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc index 6c5fb0581..9a52189f4 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/examples/socket/socket-bound-tcp-static-routing.cc @@ -192,7 +192,6 @@ main (int argc, char *argv[]) void BindSock (Ptr sock, Ptr netdev) { sock->BindToNetDevice (netdev); - return; } void StartFlow (Ptr localSocket, diff --git a/src/aodv/model/aodv-rqueue.cc b/src/aodv/model/aodv-rqueue.cc index 42b0a8a6f..4f851ebbe 100644 --- a/src/aodv/model/aodv-rqueue.cc +++ b/src/aodv/model/aodv-rqueue.cc @@ -156,7 +156,6 @@ RequestQueue::Drop (QueueEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetIpv4Header ().GetDestination ()); en.GetErrorCallback () (en.GetPacket (), en.GetIpv4Header (), Socket::ERROR_NOROUTETOHOST); - return; } } // namespace aodv diff --git a/src/core/model/trickle-timer.cc b/src/core/model/trickle-timer.cc index de442444d..16582da8d 100644 --- a/src/core/model/trickle-timer.cc +++ b/src/core/model/trickle-timer.cc @@ -187,8 +187,6 @@ TrickleTimer::Enable () Time timerExpitation = m_uniRand->GetValue (0.5, 1) * m_currentInterval; m_timerExpiration = Simulator::Schedule (timerExpitation, &TrickleTimer::TimerExpire, this); - - return; } void @@ -223,8 +221,6 @@ TrickleTimer::Reset () Time timerExpitation = m_uniRand->GetValue (0.5, 1) * m_currentInterval; m_timerExpiration = Simulator::Schedule (timerExpitation, &TrickleTimer::TimerExpire, this); - - return; } void diff --git a/src/dsdv/model/dsdv-packet-queue.cc b/src/dsdv/model/dsdv-packet-queue.cc index 989e9899c..27feab763 100644 --- a/src/dsdv/model/dsdv-packet-queue.cc +++ b/src/dsdv/model/dsdv-packet-queue.cc @@ -187,7 +187,6 @@ PacketQueue::Drop (QueueEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetIpv4Header ().GetDestination ()); // en.GetErrorCallback () (en.GetPacket (), en.GetIpv4Header (), // Socket::ERROR_NOROUTETOHOST); - return; } } diff --git a/src/dsdv/model/dsdv-rtable.cc b/src/dsdv/model/dsdv-rtable.cc index ae422b505..8d92c5b67 100644 --- a/src/dsdv/model/dsdv-rtable.cc +++ b/src/dsdv/model/dsdv-rtable.cc @@ -263,7 +263,6 @@ RoutingTable::Purge (std::map & removedAddresses ++i; } } - return; } void diff --git a/src/dsr/model/dsr-errorbuff.cc b/src/dsr/model/dsr-errorbuff.cc index 9316ce8fd..544bd305f 100644 --- a/src/dsr/model/dsr-errorbuff.cc +++ b/src/dsr/model/dsr-errorbuff.cc @@ -188,7 +188,6 @@ DsrErrorBuffer::Drop (DsrErrorBuffEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetDestination ()); // en.GetErrorCallback () (en.GetPacket (), en.GetDestination (), // Socket::ERROR_NOROUTETOHOST); - return; } void @@ -197,7 +196,6 @@ DsrErrorBuffer::DropLink (DsrErrorBuffEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetSource () << " " << en.GetNextHop ()); // en.GetErrorCallback () (en.GetPacket (), en.GetDestination (), // Socket::ERROR_NOROUTETOHOST); - return; } } // namespace dsr } // namespace ns3 diff --git a/src/dsr/model/dsr-passive-buff.cc b/src/dsr/model/dsr-passive-buff.cc index bc978ce64..4c670c49e 100644 --- a/src/dsr/model/dsr-passive-buff.cc +++ b/src/dsr/model/dsr-passive-buff.cc @@ -206,7 +206,6 @@ DsrPassiveBuffer::Drop (DsrPassiveBuffEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetDestination ()); // en.GetErrorCallback () (en.GetPacket (), en.GetDestination (), // Socket::ERROR_NOROUTETOHOST); - return; } void @@ -215,7 +214,6 @@ DsrPassiveBuffer::DropLink (DsrPassiveBuffEntry en, std::string reason) NS_LOG_LOGIC (reason << en.GetPacket ()->GetUid () << " " << en.GetSource () << " " << en.GetNextHop ()); // en.GetErrorCallback () (en.GetPacket (), en.GetDestination (), // Socket::ERROR_NOROUTETOHOST); - return; } } // namespace dsr } // namespace ns3 diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc index 01bde7966..f943544f5 100644 --- a/src/dsr/model/dsr-rcache.cc +++ b/src/dsr/model/dsr-rcache.cc @@ -1025,7 +1025,6 @@ DsrRouteCache::Purge () m_sortedRoutes.erase (itmp); } } - return; } void diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index 76fb67383..a962c515b 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -3110,7 +3110,6 @@ DsrRouting::RouteRequestTimerExpire (Ptr packet, std::vectorGetUid () << " " << en.GetDestination ()); // en.GetErrorCallback () (en.GetPacket (), en.GetDestination (), // Socket::ERROR_NOROUTETOHOST); - return; } } // namespace dsr } // namespace ns3 diff --git a/src/internet/model/ipv4-address-generator.cc b/src/internet/model/ipv4-address-generator.cc index e616a447c..b19d1d608 100644 --- a/src/internet/model/ipv4-address-generator.cc +++ b/src/internet/model/ipv4-address-generator.cc @@ -270,7 +270,6 @@ Ipv4AddressGeneratorImpl::Init ( NS_ABORT_MSG_UNLESS (addrBits <= m_netTable[index].addrMax, "Ipv4AddressGeneratorImpl::Init(): Address overflow"); m_netTable[index].addr = addrBits; - return; } Ipv4Address diff --git a/src/internet/model/ipv4-end-point.cc b/src/internet/model/ipv4-end-point.cc index b25cbd03b..d2974d1ee 100644 --- a/src/internet/model/ipv4-end-point.cc +++ b/src/internet/model/ipv4-end-point.cc @@ -97,7 +97,6 @@ Ipv4EndPoint::BindToNetDevice (Ptr netdevice) { NS_LOG_FUNCTION (this << netdevice); m_boundnetdevice = netdevice; - return; } Ptr diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index 44307f0a2..b34ce710c 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -264,7 +264,6 @@ Ipv4L3Protocol::DeleteRawSocket (Ptr socket) return; } } - return; } /* * This method is called by AggregateObject and completes the aggregation @@ -1048,7 +1047,6 @@ Ipv4L3Protocol::IpMulticastForward (Ptr mrtentry, Ptr packet, const Ipv4Header & ipv4Head } while (moreFragment); - - return; } bool @@ -1705,7 +1701,6 @@ void Ipv4L3Protocol::Fragments::SetTimeoutIter (FragmentsTimeoutsListI_t iter) { m_timeoutIter = iter; - return; } Ipv4L3Protocol::FragmentsTimeoutsListI_t @@ -1879,8 +1874,6 @@ Ipv4L3Protocol::HandleTimeout (void) Time difference = std::get<0> (*m_timeoutEventList.begin ()) - now; m_timeoutEvent = Simulator::Schedule (difference, &Ipv4L3Protocol::HandleTimeout, this); - - return; } } // namespace ns3 diff --git a/src/internet/model/ipv6-address-generator.cc b/src/internet/model/ipv6-address-generator.cc index 87cc59833..d71c2d478 100644 --- a/src/internet/model/ipv6-address-generator.cc +++ b/src/internet/model/ipv6-address-generator.cc @@ -293,7 +293,6 @@ Ipv6AddressGeneratorImpl::Init ( { m_netTable[index].addr[j] = interfaceIdBits[j]; } - return; } Ipv6Address diff --git a/src/internet/model/ipv6-end-point.cc b/src/internet/model/ipv6-end-point.cc index 91b18fce3..2bae90292 100644 --- a/src/internet/model/ipv6-end-point.cc +++ b/src/internet/model/ipv6-end-point.cc @@ -82,7 +82,6 @@ uint16_t Ipv6EndPoint::GetPeerPort () void Ipv6EndPoint::BindToNetDevice (Ptr netdevice) { m_boundnetdevice = netdevice; - return; } Ptr Ipv6EndPoint::GetBoundNetDevice (void) diff --git a/src/internet/model/ipv6-extension.cc b/src/internet/model/ipv6-extension.cc index 2bfcb676c..b11303e99 100644 --- a/src/internet/model/ipv6-extension.cc +++ b/src/internet/model/ipv6-extension.cc @@ -661,8 +661,6 @@ void Ipv6ExtensionFragment::HandleTimeout (void) Time difference = std::get<0> (*m_timeoutEventList.begin ()) - now; NS_LOG_DEBUG ("Scheduling later HandleTimeout at " << (now + difference).GetSeconds ()); m_timeoutEvent = Simulator::Schedule (difference, &Ipv6ExtensionFragment::HandleTimeout, this); - - return; } @@ -770,7 +768,6 @@ void Ipv6ExtensionFragment::Fragments::SetTimeoutIter (FragmentsTimeoutsListI_t { NS_LOG_FUNCTION (this); m_timeoutIter = iter; - return; } Ipv6ExtensionFragment::FragmentsTimeoutsListI_t Ipv6ExtensionFragment::Fragments::GetTimeoutIter () diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc index 4c76587e1..a1f0622cd 100644 --- a/src/internet/model/ipv6-l3-protocol.cc +++ b/src/internet/model/ipv6-l3-protocol.cc @@ -1335,7 +1335,6 @@ void Ipv6L3Protocol::IpMulticastForward (Ptr idev, PtrSetGateway (Ipv6Address::GetAny ()); rtentry->SetOutputDevice (GetNetDevice (interfaceId)); SendRealOut (rtentry, packet, h); - continue; } } diff --git a/src/internet/model/rip.cc b/src/internet/model/rip.cc index 8ea375f1f..e7bf0ebfd 100644 --- a/src/internet/model/rip.cc +++ b/src/internet/model/rip.cc @@ -783,7 +783,6 @@ void Rip::Receive (Ptr socket) { NS_LOG_LOGIC ("Ignoring message with unknown command: " << int (hdr.GetCommand ())); } - return; } void Rip::HandleRequests (RipHeader requestHdr, Ipv4Address senderAddress, uint16_t senderPort, uint32_t incomingInterface, uint8_t hopLimit) diff --git a/src/internet/model/ripng.cc b/src/internet/model/ripng.cc index bc7d7f98b..308f0c227 100644 --- a/src/internet/model/ripng.cc +++ b/src/internet/model/ripng.cc @@ -754,7 +754,6 @@ void RipNg::Receive (Ptr socket) { NS_LOG_LOGIC ("Ignoring message with unknown command: " << int (hdr.GetCommand ())); } - return; } void RipNg::HandleRequests (RipNgHeader requestHdr, Ipv6Address senderAddress, uint16_t senderPort, uint32_t incomingInterface, uint8_t hopLimit) diff --git a/src/internet/model/rtt-estimator.cc b/src/internet/model/rtt-estimator.cc index 2228603d1..4084f52de 100644 --- a/src/internet/model/rtt-estimator.cc +++ b/src/internet/model/rtt-estimator.cc @@ -212,7 +212,6 @@ RttMeanDeviation::FloatingPointUpdate (Time m) // RTTVAR <- (1 - beta) * RTTVAR + beta * |SRTT - R'| Time difference = Abs (err) - m_estimatedVariation; m_estimatedVariation += difference * m_beta; - return; } void @@ -232,7 +231,6 @@ RttMeanDeviation::IntegerUpdate (Time m, uint32_t rttShift, uint32_t variationSh int64_t rttvar = m_estimatedVariation.GetInteger () << variationShift; rttvar += delta; m_estimatedVariation = Time::From (rttvar >> variationShift); - return; } void diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index 3e02c70ff..b683156f1 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -987,8 +987,6 @@ TcpSocketBase::BindToNetDevice (Ptr netdevice) { m_endPoint6->BindToNetDevice (netdevice); } - - return; } /* Clean up after Bind. Set up callback functions in the end-point. */ diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index 455f55d08..a4deefe23 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -991,8 +991,6 @@ UdpSocketImpl::BindToNetDevice (Ptr netdevice) } } } - - return; } void diff --git a/src/internet/test/ipv6-dual-stack-test-suite.cc b/src/internet/test/ipv6-dual-stack-test-suite.cc index b691f4f24..9379a8c71 100644 --- a/src/internet/test/ipv6-dual-stack-test-suite.cc +++ b/src/internet/test/ipv6-dual-stack-test-suite.cc @@ -221,36 +221,30 @@ DualStackTestCase::SetUpSim () source2 = sockFactory1->CreateSocket (); source3 = sockFactory1->CreateSocket (); source4 = sockFactory1->CreateSocket (); - - return; } void DualStackTestCase::ServerHandleConnectionCreated1 (Ptr s, const Address & addr) { receivedAddr1 = addr; - return; } void DualStackTestCase::ServerHandleConnectionCreated2 (Ptr s, const Address & addr) { receivedAddr2 = addr; - return; } void DualStackTestCase::ServerHandleConnectionCreated3 (Ptr s, const Address & addr) { receivedAddr3 = addr; - return; } void DualStackTestCase::ServerHandleConnectionCreated4 (Ptr s, const Address & addr) { receivedAddr4 = addr; - return; } diff --git a/src/lr-wpan/helper/lr-wpan-helper.cc b/src/lr-wpan/helper/lr-wpan-helper.cc index f8813de09..11e6899da 100644 --- a/src/lr-wpan/helper/lr-wpan-helper.cc +++ b/src/lr-wpan/helper/lr-wpan-helper.cc @@ -251,7 +251,6 @@ LrWpanHelper::AssociateToPan (NetDeviceContainer c, uint16_t panId) id++; } } - return; } void @@ -308,7 +307,6 @@ LrWpanHelper::AssociateToBeaconPan (NetDeviceContainer c, uint16_t panId, Mac16A id++; } } - return; } /** diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc index 8d2d17183..c8e13cfa2 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.cc +++ b/src/lte/model/cqa-ff-mac-scheduler.cc @@ -240,7 +240,6 @@ CqaFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::C FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -279,7 +278,6 @@ CqaFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Csc { (*it).second = params.m_transmissionMode; } - return; } void @@ -359,8 +357,6 @@ CqaFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csc } } - - return; } void @@ -402,7 +398,6 @@ CqaFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::Cs } } } - return; } void @@ -451,8 +446,6 @@ CqaFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::Cs { m_nextRntiUl = 0; } - - return; } @@ -476,8 +469,6 @@ CqaFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sc { (*it).second = params; } - - return; } void @@ -485,7 +476,6 @@ CqaFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -493,7 +483,6 @@ CqaFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::Sc { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1665,8 +1654,6 @@ CqaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche count_allocated_resource_blocks+=itMap->second.size (); } NS_LOG_INFO (this << " Allocated RBs:" << count_allocated_resource_blocks); - - return; } void @@ -1675,8 +1662,6 @@ CqaFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sch NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1736,8 +1721,6 @@ CqaFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sche NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -2178,22 +2161,18 @@ CqaFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sche } m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void CqaFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void CqaFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -2236,8 +2215,6 @@ CqaFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider:: } } } - - return; } void @@ -2384,7 +2361,6 @@ CqaFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sche default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -2435,8 +2411,6 @@ CqaFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -2466,8 +2440,6 @@ CqaFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index ecc9cbe90..44c2c9421 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -153,7 +153,6 @@ FdBetFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider: FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -192,7 +191,6 @@ FdBetFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::C { (*it).second = params.m_transmissionMode; } - return; } void @@ -221,8 +219,6 @@ FdBetFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::C m_flowStatsUl.insert (std::pair (params.m_rnti, flowStatsUl)); } } - - return; } void @@ -247,7 +243,6 @@ FdBetFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider:: } } } - return; } void @@ -286,8 +281,6 @@ FdBetFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider:: { m_nextRntiUl = 0; } - - return; } @@ -311,8 +304,6 @@ FdBetFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider:: { (*it).second = params; } - - return; } void @@ -320,7 +311,6 @@ FdBetFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvide { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -328,7 +318,6 @@ FdBetFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider:: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1185,9 +1174,6 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc } m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1196,8 +1182,6 @@ FdBetFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::S NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1256,8 +1240,6 @@ FdBetFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sc NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1672,22 +1654,18 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sc } m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void FdBetFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void FdBetFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1730,8 +1708,6 @@ FdBetFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider } } } - - return; } void @@ -1877,7 +1853,6 @@ FdBetFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sc default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -1928,8 +1903,6 @@ FdBetFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -1959,8 +1932,6 @@ FdBetFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void @@ -2037,7 +2008,6 @@ FdBetFfMacScheduler::UpdateUlRlcBufferInfo (uint16_t rnti, uint16_t size) { NS_LOG_ERROR (this << " Does not find BSR report info of UE " << rnti); } - } void diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index 81ce7d53d..4f48a65b3 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -152,7 +152,6 @@ FdMtFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider:: FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -191,7 +190,6 @@ FdMtFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Cs { (*it).second = params.m_transmissionMode; } - return; } void @@ -210,8 +208,6 @@ FdMtFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Cs m_flowStatsUl.insert (params.m_rnti); } } - - return; } void @@ -236,7 +232,6 @@ FdMtFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::C } } } - return; } void @@ -275,8 +270,6 @@ FdMtFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::C { m_nextRntiUl = 0; } - - return; } @@ -300,8 +293,6 @@ FdMtFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::S { (*it).second = params; } - - return; } void @@ -309,7 +300,6 @@ FdMtFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -317,7 +307,6 @@ FdMtFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::S { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1132,9 +1121,6 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1143,8 +1129,6 @@ FdMtFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sc NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1203,8 +1187,6 @@ FdMtFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sch NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1596,22 +1578,18 @@ FdMtFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sch m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void FdMtFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void FdMtFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1654,8 +1632,6 @@ FdMtFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider: } } } - - return; } void @@ -1801,7 +1777,6 @@ FdMtFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sch default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -1852,8 +1827,6 @@ FdMtFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -1883,8 +1856,6 @@ FdMtFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 184062f18..17ae71bed 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -178,7 +178,6 @@ FdTbfqFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -217,7 +216,6 @@ FdTbfqFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider:: { (*it).second = params.m_transmissionMode; } - return; } void @@ -270,8 +268,6 @@ FdTbfqFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider:: } } - - return; } void @@ -296,7 +292,6 @@ FdTbfqFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider: } } } - return; } void @@ -335,8 +330,6 @@ FdTbfqFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider: { m_nextRntiUl = 0; } - - return; } @@ -360,8 +353,6 @@ FdTbfqFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider: { (*it).second = params; } - - return; } void @@ -369,7 +360,6 @@ FdTbfqFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvid { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -377,7 +367,6 @@ FdTbfqFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1505,9 +1494,6 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1516,8 +1502,6 @@ FdTbfqFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider:: NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1577,8 +1561,6 @@ FdTbfqFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::S NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1995,22 +1977,18 @@ FdTbfqFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::S m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void FdTbfqFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void FdTbfqFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -2053,8 +2031,6 @@ FdTbfqFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvide } } } - - return; } void @@ -2200,7 +2176,6 @@ FdTbfqFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::S default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -2251,8 +2226,6 @@ FdTbfqFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -2282,8 +2255,6 @@ FdTbfqFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/lte-asn1-header.cc b/src/lte/model/lte-asn1-header.cc index 05f7e2480..17fb5ed6b 100644 --- a/src/lte/model/lte-asn1-header.cc +++ b/src/lte/model/lte-asn1-header.cc @@ -418,7 +418,6 @@ void Asn1Header::SerializeInteger (int n, int nmin, int nmax) const void Asn1Header::SerializeNull () const { // Clause 18 ITU-T X.691 - return; } void Asn1Header::FinalizeSerialization () const diff --git a/src/lte/model/lte-ffr-enhanced-algorithm.cc b/src/lte/model/lte-ffr-enhanced-algorithm.cc index 54073a1e8..31ab71b5c 100644 --- a/src/lte/model/lte-ffr-enhanced-algorithm.cc +++ b/src/lte/model/lte-ffr-enhanced-algorithm.cc @@ -732,8 +732,6 @@ LteFfrEnhancedAlgorithm::DoReportDlCqiInfo (const struct FfMacSchedSapProvider:: m_ulRbAvailableforUe.insert ( std::pair > (rnti, ulRbAvailableMap ) ); } - - return; } void diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index c2f45cb73..0714f8e7f 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -156,7 +156,6 @@ PfFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::Cs FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -195,7 +194,6 @@ PfFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Csch { (*it).second = params.m_transmissionMode; } - return; } void @@ -224,8 +222,6 @@ PfFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csch m_flowStatsUl.insert (std::pair (params.m_rnti, flowStatsUl)); } } - - return; } void @@ -250,7 +246,6 @@ PfFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::Csc } } } - return; } void @@ -289,8 +284,6 @@ PfFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::Csc { m_nextRntiUl = 0; } - - return; } @@ -314,8 +307,6 @@ PfFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sch { (*it).second = params; } - - return; } void @@ -323,7 +314,6 @@ PfFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider:: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -331,7 +321,6 @@ PfFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::Sch { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1235,9 +1224,6 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched } m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1246,8 +1232,6 @@ PfFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sche NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1307,8 +1291,6 @@ PfFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sched NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1749,22 +1731,18 @@ PfFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched } m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void PfFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void PfFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1807,8 +1785,6 @@ PfFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider::S } } } - - return; } void @@ -1958,7 +1934,6 @@ PfFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sched default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -2009,8 +1984,6 @@ PfFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -2040,8 +2013,6 @@ PfFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index 01dc1878a..ff4bc09dc 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -169,7 +169,6 @@ PssFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::C FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -208,7 +207,6 @@ PssFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Csc { (*it).second = params.m_transmissionMode; } - return; } void @@ -252,8 +250,6 @@ PssFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csc m_flowStatsUl[(*it).first].targetThroughput = tbrUlInBytes; } } - - return; } void @@ -278,7 +274,6 @@ PssFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::Cs } } } - return; } void @@ -317,8 +312,6 @@ PssFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::Cs { m_nextRntiUl = 0; } - - return; } @@ -342,8 +335,6 @@ PssFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sc { (*it).second = params; } - - return; } void @@ -351,7 +342,6 @@ PssFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -359,7 +349,6 @@ PssFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::Sc { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1566,9 +1555,6 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1577,8 +1563,6 @@ PssFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sch NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1638,8 +1622,6 @@ PssFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sche NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -2056,22 +2038,18 @@ PssFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sche m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void PssFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void PssFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -2114,8 +2092,6 @@ PssFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider:: } } } - - return; } void @@ -2261,7 +2237,6 @@ PssFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sche default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -2312,8 +2287,6 @@ PssFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -2343,8 +2316,6 @@ PssFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 71df78895..422fc7d7a 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -155,7 +155,6 @@ RrFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::Cs FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -194,7 +193,6 @@ RrFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Csch { (*it).second = params.m_transmissionMode; } - return; } void @@ -202,7 +200,6 @@ RrFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csch { NS_LOG_FUNCTION (this); // Not used at this stage (LCs updated by DoSchedDlRlcBufferReq) - return; } void @@ -224,7 +221,6 @@ RrFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::Csc } } } - return; } void @@ -264,8 +260,6 @@ RrFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::Csc { m_nextRntiDl = 0; } - - return; } @@ -299,8 +293,6 @@ RrFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sch // initialized to 1 (i.e., the lowest value for transmitting a signal) m_p10CqiTimers.insert ( std::pair (params.m_rnti, m_cqiTimersThreshold)); } - - return; } void @@ -308,7 +300,6 @@ RrFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider:: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -316,7 +307,6 @@ RrFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::Sch { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1081,7 +1071,6 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - return; } void @@ -1090,8 +1079,6 @@ RrFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sche NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1135,8 +1122,6 @@ RrFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sched NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } void @@ -1480,21 +1465,18 @@ RrFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sched m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - return; } void RrFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void RrFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1538,8 +1520,6 @@ RrFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider::S } } } - - return; } void @@ -1683,7 +1663,6 @@ RrFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sched default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } @@ -1713,8 +1692,6 @@ RrFfMacScheduler::RefreshDlCqiMaps (void) itP10++; } } - - return; } @@ -1744,8 +1721,6 @@ RrFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index 87dd4c14f..b16698e70 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -153,7 +153,6 @@ TdBetFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider: FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -192,7 +191,6 @@ TdBetFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::C { (*it).second = params.m_transmissionMode; } - return; } void @@ -221,8 +219,6 @@ TdBetFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::C m_flowStatsUl.insert (std::pair (params.m_rnti, flowStatsUl)); } } - - return; } void @@ -247,7 +243,6 @@ TdBetFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider:: } } } - return; } void @@ -286,8 +281,6 @@ TdBetFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider:: { m_nextRntiUl = 0; } - - return; } @@ -311,8 +304,6 @@ TdBetFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider:: { (*it).second = params; } - - return; } void @@ -320,7 +311,6 @@ TdBetFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvide { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -328,7 +318,6 @@ TdBetFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider:: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1107,9 +1096,6 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc } m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1118,8 +1104,6 @@ TdBetFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::S NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1178,8 +1162,6 @@ TdBetFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sc NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1594,22 +1576,18 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sc } m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void TdBetFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void TdBetFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1652,8 +1630,6 @@ TdBetFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider } } } - - return; } void @@ -1799,7 +1775,6 @@ TdBetFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sc default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -1850,8 +1825,6 @@ TdBetFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -1881,8 +1854,6 @@ TdBetFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc index c83f7f0f1..4b6d91838 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.cc +++ b/src/lte/model/tdmt-ff-mac-scheduler.cc @@ -152,7 +152,6 @@ TdMtFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider:: FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -191,7 +190,6 @@ TdMtFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Cs { (*it).second = params.m_transmissionMode; } - return; } void @@ -210,8 +208,6 @@ TdMtFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Cs m_flowStatsUl.insert (params.m_rnti); } } - - return; } void @@ -236,7 +232,6 @@ TdMtFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::C } } } - return; } void @@ -275,8 +270,6 @@ TdMtFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::C { m_nextRntiUl = 0; } - - return; } @@ -300,8 +293,6 @@ TdMtFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::S { (*it).second = params; } - - return; } void @@ -309,7 +300,6 @@ TdMtFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -317,7 +307,6 @@ TdMtFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::S { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1076,9 +1065,6 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1087,8 +1073,6 @@ TdMtFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sc NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1147,8 +1131,6 @@ TdMtFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sch NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1540,22 +1522,18 @@ TdMtFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sch m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void TdMtFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void TdMtFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1598,8 +1576,6 @@ TdMtFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider: } } } - - return; } void @@ -1745,7 +1721,6 @@ TdMtFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sch default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -1796,8 +1771,6 @@ TdMtFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -1827,8 +1800,6 @@ TdMtFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index d81d5167e..804138f92 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -178,7 +178,6 @@ TdTbfqFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -217,7 +216,6 @@ TdTbfqFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider:: { (*it).second = params.m_transmissionMode; } - return; } void @@ -268,8 +266,6 @@ TdTbfqFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider:: } } - - return; } void @@ -294,7 +290,6 @@ TdTbfqFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider: } } } - return; } void @@ -333,8 +328,6 @@ TdTbfqFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider: { m_nextRntiUl = 0; } - - return; } @@ -358,8 +351,6 @@ TdTbfqFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider: { (*it).second = params; } - - return; } void @@ -367,7 +358,6 @@ TdTbfqFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvid { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -375,7 +365,6 @@ TdTbfqFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1265,9 +1254,6 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1276,8 +1262,6 @@ TdTbfqFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider:: NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1337,8 +1321,6 @@ TdTbfqFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::S NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1755,22 +1737,18 @@ TdTbfqFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::S m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void TdTbfqFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void TdTbfqFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1813,8 +1791,6 @@ TdTbfqFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvide } } } - - return; } void @@ -1960,7 +1936,6 @@ TdTbfqFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::S default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -2011,8 +1986,6 @@ TdTbfqFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -2042,8 +2015,6 @@ TdTbfqFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 2f325d41e..89c77206d 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -152,7 +152,6 @@ TtaFfMacScheduler::DoCschedCellConfigReq (const struct FfMacCschedSapProvider::C FfMacCschedSapUser::CschedUeConfigCnfParameters cnf; cnf.m_result = SUCCESS; m_cschedSapUser->CschedUeConfigCnf (cnf); - return; } void @@ -191,7 +190,6 @@ TtaFfMacScheduler::DoCschedUeConfigReq (const struct FfMacCschedSapProvider::Csc { (*it).second = params.m_transmissionMode; } - return; } void @@ -210,8 +208,6 @@ TtaFfMacScheduler::DoCschedLcConfigReq (const struct FfMacCschedSapProvider::Csc m_flowStatsUl.insert (params.m_rnti); } } - - return; } void @@ -236,7 +232,6 @@ TtaFfMacScheduler::DoCschedLcReleaseReq (const struct FfMacCschedSapProvider::Cs } } } - return; } void @@ -275,8 +270,6 @@ TtaFfMacScheduler::DoCschedUeReleaseReq (const struct FfMacCschedSapProvider::Cs { m_nextRntiUl = 0; } - - return; } @@ -300,8 +293,6 @@ TtaFfMacScheduler::DoSchedDlRlcBufferReq (const struct FfMacSchedSapProvider::Sc { (*it).second = params; } - - return; } void @@ -309,7 +300,6 @@ TtaFfMacScheduler::DoSchedDlPagingBufferReq (const struct FfMacSchedSapProvider: { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } void @@ -317,7 +307,6 @@ TtaFfMacScheduler::DoSchedDlMacBufferReq (const struct FfMacSchedSapProvider::Sc { NS_LOG_FUNCTION (this); NS_FATAL_ERROR ("method not implemented"); - return; } int @@ -1150,9 +1139,6 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche ret.m_nrOfPdcchOfdmSymbols = 1; /// \todo check correct value according the DCIs txed m_schedSapUser->SchedDlConfigInd (ret); - - - return; } void @@ -1161,8 +1147,6 @@ TtaFfMacScheduler::DoSchedDlRachInfoReq (const struct FfMacSchedSapProvider::Sch NS_LOG_FUNCTION (this); m_rachList = params.m_rachList; - - return; } void @@ -1221,8 +1205,6 @@ TtaFfMacScheduler::DoSchedDlCqiInfoReq (const struct FfMacSchedSapProvider::Sche NS_LOG_ERROR (this << " CQI type unknown"); } } - - return; } @@ -1614,22 +1596,18 @@ TtaFfMacScheduler::DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::Sche m_allocationMaps.insert (std::pair > (params.m_sfnSf, rbgAllocationMap)); m_schedSapUser->SchedUlConfigInd (ret); - - return; } void TtaFfMacScheduler::DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void TtaFfMacScheduler::DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params) { NS_LOG_FUNCTION (this); - return; } void @@ -1672,8 +1650,6 @@ TtaFfMacScheduler::DoSchedUlMacCtrlInfoReq (const struct FfMacSchedSapProvider:: } } } - - return; } void @@ -1819,7 +1795,6 @@ TtaFfMacScheduler::DoSchedUlCqiInfoReq (const struct FfMacSchedSapProvider::Sche default: NS_FATAL_ERROR ("Unknown type of UL-CQI"); } - return; } void @@ -1870,8 +1845,6 @@ TtaFfMacScheduler::RefreshDlCqiMaps (void) itA30++; } } - - return; } @@ -1901,8 +1874,6 @@ TtaFfMacScheduler::RefreshUlCqiMaps (void) itUl++; } } - - return; } void diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index c04eeefca..277d19a7b 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -2160,7 +2160,6 @@ AnimationInterface::SetOutputFile (const std::string& fn, bool routing) m_f = f; m_outputFileName = fn; } - return; } void diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc index 39a39966f..0a14febe6 100644 --- a/src/network/model/socket.cc +++ b/src/network/model/socket.cc @@ -344,7 +344,6 @@ Socket::BindToNetDevice (Ptr netdevice) NS_ASSERT_MSG (found, "Socket cannot be bound to a NetDevice not existing on the Node"); } m_boundnetdevice = netdevice; - return; } Ptr diff --git a/src/network/test/packetbb-test-suite.cc b/src/network/test/packetbb-test-suite.cc index e10da11e8..11f3be80c 100644 --- a/src/network/test/packetbb-test-suite.cc +++ b/src/network/test/packetbb-test-suite.cc @@ -74,7 +74,6 @@ PbbTestCase::PbbTestCase (std::string name, Ptr packet, PbbTestCase::~PbbTestCase (void) { - return; } void diff --git a/src/network/utils/packetbb.cc b/src/network/utils/packetbb.cc index 37c44b36c..9d9c8e7fe 100644 --- a/src/network/utils/packetbb.cc +++ b/src/network/utils/packetbb.cc @@ -63,7 +63,6 @@ NS_OBJECT_ENSURE_REGISTERED (PbbPacket); PbbTlvBlock::PbbTlvBlock (void) { NS_LOG_FUNCTION (this); - return; } PbbTlvBlock::~PbbTlvBlock (void) @@ -304,7 +303,6 @@ PbbTlvBlock::operator!= (const PbbTlvBlock &other) const PbbAddressTlvBlock::PbbAddressTlvBlock (void) { NS_LOG_FUNCTION (this); - return; } PbbAddressTlvBlock::~PbbAddressTlvBlock (void) diff --git a/src/network/utils/simple-net-device.cc b/src/network/utils/simple-net-device.cc index b665c2b43..d5f44f227 100644 --- a/src/network/utils/simple-net-device.cc +++ b/src/network/utils/simple-net-device.cc @@ -499,8 +499,6 @@ SimpleNetDevice::FinishTransmission (Ptr packet) m_channel->Send (packet, proto, dst, src, this); StartTransmission (); - - return; } Ptr diff --git a/src/sixlowpan/model/sixlowpan-header.cc b/src/sixlowpan/model/sixlowpan-header.cc index d584f7e97..6d5b6255b 100644 --- a/src/sixlowpan/model/sixlowpan-header.cc +++ b/src/sixlowpan/model/sixlowpan-header.cc @@ -1297,7 +1297,6 @@ void SixLowPanIphc::SetSrcInlinePart (uint8_t srcInlinePart[16], uint8_t size) NS_ASSERT_MSG (size <= 16, "Src inline part too large"); memcpy (m_srcInlinePart, srcInlinePart, size); - return; } void SixLowPanIphc::SetM (bool mField) @@ -1343,7 +1342,6 @@ void SixLowPanIphc::SetDstInlinePart (uint8_t dstInlinePart[16], uint8_t size) NS_ASSERT_MSG (size <= 16, "Dst inline part too large"); memcpy (m_dstInlinePart, dstInlinePart, size); - return; } void SixLowPanIphc::SetSrcContextId (uint8_t srcContextId) diff --git a/src/sixlowpan/model/sixlowpan-net-device.cc b/src/sixlowpan/model/sixlowpan-net-device.cc index 6d51c2747..d89f07bc8 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.cc +++ b/src/sixlowpan/model/sixlowpan-net-device.cc @@ -377,8 +377,6 @@ void SixLowPanNetDevice::ReceiveFromDevice (Ptr incomingPort, } m_rxCallback (this, copyPkt, Ipv6L3Protocol::PROT_NUMBER, realSrc); - - return; } void SixLowPanNetDevice::SetIfIndex (const uint32_t index) @@ -2315,8 +2313,6 @@ void SixLowPanNetDevice::DoFragmentation (Ptr packet, } } while (moreFrag); - - return; } bool SixLowPanNetDevice::ProcessFragment (Ptr& packet, Address const &src, Address const &dst, bool isFirst) @@ -2576,7 +2572,6 @@ void SixLowPanNetDevice::Fragments::SetTimeoutIter (FragmentsTimeoutsListI_t iter) { m_timeoutIter = iter; - return; } SixLowPanNetDevice::FragmentsTimeoutsListI_t @@ -2646,8 +2641,6 @@ void SixLowPanNetDevice::HandleTimeout (void) Time difference = std::get<0> (*m_timeoutEventList.begin ()) - now; m_timeoutEvent = Simulator::Schedule (difference, &SixLowPanNetDevice::HandleTimeout, this); - - return; } void SixLowPanNetDevice::AddContext (uint8_t contextId, Ipv6Prefix contextPrefix, bool compressionAllowed, Time validLifetime) @@ -2670,8 +2663,6 @@ void SixLowPanNetDevice::AddContext (uint8_t contextId, Ipv6Prefix contextPrefix m_contextTable[contextId].contextPrefix = contextPrefix; m_contextTable[contextId].compressionAllowed = compressionAllowed; m_contextTable[contextId].validLifetime = Simulator::Now () + validLifetime; - - return; } bool SixLowPanNetDevice::GetContext (uint8_t contextId, Ipv6Prefix& contextPrefix, bool& compressionAllowed, Time& validLifetime) @@ -2714,7 +2705,6 @@ void SixLowPanNetDevice::RenewContext (uint8_t contextId, Time validLifetime) } m_contextTable[contextId].compressionAllowed = true; m_contextTable[contextId].validLifetime = Simulator::Now () + validLifetime; - return; } @@ -2734,7 +2724,6 @@ void SixLowPanNetDevice::InvalidateContext (uint8_t contextId) return; } m_contextTable[contextId].compressionAllowed = false; - return; } void SixLowPanNetDevice::RemoveContext (uint8_t contextId) @@ -2754,7 +2743,6 @@ void SixLowPanNetDevice::RemoveContext (uint8_t contextId) } m_contextTable.erase (contextId); - return; } bool SixLowPanNetDevice::FindUnicastCompressionContext (Ipv6Address address, uint8_t& contextId) diff --git a/src/topology-read/model/topology-reader.cc b/src/topology-read/model/topology-reader.cc index a55277260..ef5273cfa 100644 --- a/src/topology-read/model/topology-reader.cc +++ b/src/topology-read/model/topology-reader.cc @@ -96,7 +96,6 @@ void TopologyReader::AddLink (Link link) { m_linksList.push_back (link); - return; } diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index 7d673d036..9c26d3c2d 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -1651,7 +1651,6 @@ TestUlOfdmaPpduUid::ResetPpduUid (void) { NS_LOG_FUNCTION (this); m_phyAp->SetPpduUid (0); //one is enough since it's a global attribute - return; } void