From 68ef2890d0fe53fdfd46e2487b4ec04fed8473a0 Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Sun, 30 Apr 2023 18:26:33 +0000 Subject: [PATCH] Remove unnecessary enum specifiers --- src/core/model/time.cc | 2 +- src/core/model/timer.cc | 2 +- src/dsr/model/dsr-routing.cc | 7 +++---- src/internet/model/icmpv4-l4-protocol.cc | 4 ++-- src/internet/model/icmpv6-l4-protocol.cc | 4 ++-- src/internet/model/ipv4-raw-socket-impl.cc | 4 ++-- src/internet/model/ipv6-raw-socket-impl.cc | 4 ++-- src/internet/model/tcp-l4-protocol.cc | 6 +++--- src/internet/model/tcp-socket-base.cc | 4 ++-- src/internet/model/udp-l4-protocol.cc | 4 ++-- src/internet/model/udp-socket-impl.cc | 4 ++-- src/lr-wpan/model/lr-wpan-mac-header.cc | 2 +- src/lte/model/ff-mac-common.h | 5 +++-- src/lte/test/lte-test-cqa-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-deactivate-bearer.cc | 2 +- src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-phy-error-model.cc | 4 ++-- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 2 +- src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc | 2 +- src/lte/test/lte-test-tta-ff-mac-scheduler.cc | 2 +- src/lte/test/test-lte-rrc.cc | 2 +- src/lte/test/test-lte-x2-handover-measures.cc | 2 +- src/lte/test/test-lte-x2-handover.cc | 2 +- src/mobility/model/position-allocator.cc | 2 +- src/network/utils/packet-socket.cc | 4 ++-- src/stats/model/gnuplot.cc | 4 ++-- .../model/rocketfuel-topology-reader.cc | 4 ++-- src/wave/model/default-channel-scheduler.cc | 2 +- src/wave/model/vendor-specific-action.cc | 2 +- src/wimax/model/cs-parameters.cc | 8 ++++---- src/wimax/model/service-flow.cc | 16 ++++++++-------- src/wimax/model/ul-job.cc | 2 +- src/wimax/model/ul-job.h | 12 ++++++------ src/wimax/model/wimax-connection.cc | 4 ++-- 36 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/core/model/time.cc b/src/core/model/time.cc index fa5e81d1a..671079247 100644 --- a/src/core/model/time.cc +++ b/src/core/model/time.cc @@ -406,7 +406,7 @@ Time::ConvertTimes(const Unit unit) } // Time::ConvertTimes () // static -enum Time::Unit +Time::Unit Time::GetResolution() { // No function log b/c it interferes with operator<< diff --git a/src/core/model/timer.cc b/src/core/model/timer.cc index 170091bd8..6a261ed8c 100644 --- a/src/core/model/timer.cc +++ b/src/core/model/timer.cc @@ -143,7 +143,7 @@ Timer::IsSuspended() const return (m_flags & TIMER_SUSPENDED) == TIMER_SUSPENDED; } -enum Timer::State +Timer::State Timer::GetState() const { NS_LOG_FUNCTION(this); diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index 50a217f57..8989c9686 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -3533,7 +3533,7 @@ DsrRouting::SendAck(uint16_t ackId, } } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus DsrRouting::Receive(Ptr p, const Ipv4Header& ip, Ptr incomingInterface) { NS_LOG_FUNCTION(this << p << ip << incomingInterface); @@ -3677,8 +3677,7 @@ DsrRouting::Receive(Ptr p, const Ipv4Header& ip, Ptr inco // we need to make a copy in the unlikely event we hit the // RX_ENDPOINT_UNREACH code path // Here we can use the packet that has been get off whole DSR header - enum IpL4Protocol::RxStatus status = - nextProto->Receive(copy, ip, incomingInterface); + IpL4Protocol::RxStatus status = nextProto->Receive(copy, ip, incomingInterface); NS_LOG_DEBUG("The receive status " << status); switch (status) { @@ -3737,7 +3736,7 @@ DsrRouting::Receive(Ptr p, const Ipv4Header& ip, Ptr inco return IpL4Protocol::RX_OK; } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus DsrRouting::Receive(Ptr p, const Ipv6Header& ip, Ptr incomingInterface) { NS_LOG_FUNCTION(this << p << ip.GetSource() << ip.GetDestination() << incomingInterface); diff --git a/src/internet/model/icmpv4-l4-protocol.cc b/src/internet/model/icmpv4-l4-protocol.cc index a93fe75c9..2dba52686 100644 --- a/src/internet/model/icmpv4-l4-protocol.cc +++ b/src/internet/model/icmpv4-l4-protocol.cc @@ -289,7 +289,7 @@ Icmpv4L4Protocol::HandleTimeExceeded(Ptr p, Forward(source, icmp, 0, ipHeader, payload); } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus Icmpv4L4Protocol::Receive(Ptr p, const Ipv4Header& header, Ptr incomingInterface) @@ -342,7 +342,7 @@ Icmpv4L4Protocol::Receive(Ptr p, return IpL4Protocol::RX_OK; } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus Icmpv4L4Protocol::Receive(Ptr p, const Ipv6Header& header, Ptr incomingInterface) diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index 33385d758..90fba2f0b 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -284,7 +284,7 @@ Icmpv6L4Protocol::DoDAD(Ipv6Address target, Ptr interface) Ipv6Address::MakeSolicitedAddress(target)); } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus Icmpv6L4Protocol::Receive(Ptr packet, const Ipv4Header& header, Ptr interface) @@ -293,7 +293,7 @@ Icmpv6L4Protocol::Receive(Ptr packet, return IpL4Protocol::RX_ENDPOINT_UNREACH; } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus Icmpv6L4Protocol::Receive(Ptr packet, const Ipv6Header& header, Ptr interface) diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc index 3d12b8c4f..63742292b 100644 --- a/src/internet/model/ipv4-raw-socket-impl.cc +++ b/src/internet/model/ipv4-raw-socket-impl.cc @@ -88,14 +88,14 @@ Ipv4RawSocketImpl::DoDispose() Socket::DoDispose(); } -enum Socket::SocketErrno +Socket::SocketErrno Ipv4RawSocketImpl::GetErrno() const { NS_LOG_FUNCTION(this); return m_err; } -enum Socket::SocketType +Socket::SocketType Ipv4RawSocketImpl::GetSocketType() const { NS_LOG_FUNCTION(this); diff --git a/src/internet/model/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc index a8690f065..4e7ed766c 100644 --- a/src/internet/model/ipv6-raw-socket-impl.cc +++ b/src/internet/model/ipv6-raw-socket-impl.cc @@ -100,14 +100,14 @@ Ipv6RawSocketImpl::GetNode() const return m_node; } -enum Socket::SocketErrno +Socket::SocketErrno Ipv6RawSocketImpl::GetErrno() const { NS_LOG_FUNCTION(this); return m_err; } -enum Socket::SocketType +Socket::SocketType Ipv6RawSocketImpl::GetSocketType() const { return NS3_SOCK_RAW; diff --git a/src/internet/model/tcp-l4-protocol.cc b/src/internet/model/tcp-l4-protocol.cc index 2c8fc4271..ec6b47830 100644 --- a/src/internet/model/tcp-l4-protocol.cc +++ b/src/internet/model/tcp-l4-protocol.cc @@ -380,7 +380,7 @@ TcpL4Protocol::ReceiveIcmp(Ipv6Address icmpSource, } } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus TcpL4Protocol::PacketReceived(Ptr packet, TcpHeader& incomingTcpHeader, const Address& source, @@ -448,7 +448,7 @@ TcpL4Protocol::NoEndPointsFound(const TcpHeader& incomingHeader, } } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus TcpL4Protocol::Receive(Ptr packet, const Ipv4Header& incomingIpHeader, Ptr incomingInterface) @@ -519,7 +519,7 @@ TcpL4Protocol::Receive(Ptr packet, return IpL4Protocol::RX_OK; } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus TcpL4Protocol::Receive(Ptr packet, const Ipv6Header& incomingIpHeader, Ptr interface) diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index ee443db5c..8f672f5be 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -513,14 +513,14 @@ TcpSocketBase::SetRtt(Ptr rtt) } /* Inherit from Socket class: Returns error code */ -enum Socket::SocketErrno +Socket::SocketErrno TcpSocketBase::GetErrno() const { return m_errno; } /* Inherit from Socket class: Returns socket type, NS3_SOCK_STREAM */ -enum Socket::SocketType +Socket::SocketType TcpSocketBase::GetSocketType() const { return NS3_SOCK_STREAM; diff --git a/src/internet/model/udp-l4-protocol.cc b/src/internet/model/udp-l4-protocol.cc index 96d00b2e2..7a86cba7e 100644 --- a/src/internet/model/udp-l4-protocol.cc +++ b/src/internet/model/udp-l4-protocol.cc @@ -328,7 +328,7 @@ UdpL4Protocol::ReceiveIcmp(Ipv6Address icmpSource, } } -enum IpL4Protocol::RxStatus +IpL4Protocol::RxStatus UdpL4Protocol::Receive(Ptr packet, const Ipv4Header& header, Ptr interface) { NS_LOG_FUNCTION(this << packet << header); @@ -387,7 +387,7 @@ UdpL4Protocol::Receive(Ptr packet, const Ipv4Header& header, Ptr packet, const Ipv6Header& header, Ptr interface) { NS_LOG_FUNCTION(this << packet << header.GetSource() << header.GetDestination()); diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index c8be8d80e..a34ac7971 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -153,14 +153,14 @@ UdpSocketImpl::SetUdp(Ptr udp) m_udp = udp; } -enum Socket::SocketErrno +Socket::SocketErrno UdpSocketImpl::GetErrno() const { NS_LOG_FUNCTION(this); return m_errno; } -enum Socket::SocketType +Socket::SocketType UdpSocketImpl::GetSocketType() const { return NS3_SOCK_DGRAM; diff --git a/src/lr-wpan/model/lr-wpan-mac-header.cc b/src/lr-wpan/model/lr-wpan-mac-header.cc index 7d35530e0..e342cdb4b 100644 --- a/src/lr-wpan/model/lr-wpan-mac-header.cc +++ b/src/lr-wpan/model/lr-wpan-mac-header.cc @@ -58,7 +58,7 @@ LrWpanMacHeader::~LrWpanMacHeader() { } -enum LrWpanMacHeader::LrWpanMacType +LrWpanMacHeader::LrWpanMacType LrWpanMacHeader::GetType() const { switch (m_fctrlFrmType) diff --git a/src/lte/model/ff-mac-common.h b/src/lte/model/ff-mac-common.h index db49208d1..5c47306fc 100644 --- a/src/lte/model/ff-mac-common.h +++ b/src/lte/model/ff-mac-common.h @@ -269,7 +269,7 @@ struct BuildDataListElement_s { uint16_t m_rnti{UINT16_MAX}; ///< RNTI struct DlDciListElement_s m_dci; ///< DCI - std::vector m_ceBitmap; ///< CE bitmap + std::vector m_ceBitmap; ///< CE bitmap std::vector> m_rlcPduList; ///< RLC PDU list }; @@ -474,7 +474,8 @@ struct DlInfoListElement_s NACK, DTX }; - std::vector m_harqStatus; ///< HARQ status + + std::vector m_harqStatus; ///< HARQ status }; /** diff --git a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc index 2c9f257d0..00c31222e 100644 --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -431,7 +431,7 @@ LenaCqaFfMacSchedulerTestCase1::DoRun() qos.mbrDl = 0; qos.mbrUl = 0; - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q, qos); lteHelper->ActivateDedicatedEpsBearer(ueDevice, bearer, EpcTft::Default()); } @@ -690,7 +690,7 @@ LenaCqaFfMacSchedulerTestCase2::DoRun() qos.mbrDl = qos.gbrDl; qos.mbrUl = qos.gbrUl; - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q, qos); lteHelper->ActivateDedicatedEpsBearer(ueDevice, bearer, EpcTft::Default()); } diff --git a/src/lte/test/lte-test-deactivate-bearer.cc b/src/lte/test/lte-test-deactivate-bearer.cc index b9e849808..bee2d6bd5 100644 --- a/src/lte/test/lte-test-deactivate-bearer.cc +++ b/src/lte/test/lte-test-deactivate-bearer.cc @@ -271,7 +271,7 @@ LenaDeactivateBearerTestCase::DoRun() qos.mbrDl = qos.gbrDl; qos.mbrUl = qos.gbrUl; - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q, qos); bearer.arp.priorityLevel = 15 - (u + 1); bearer.arp.preemptionCapability = true; diff --git a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc index 5421812aa..42b273052 100644 --- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc @@ -280,7 +280,7 @@ LenaFdBetFfMacSchedulerTestCase1::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); @@ -462,7 +462,7 @@ LenaFdBetFfMacSchedulerTestCase2::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc index 2eb1a6f68..94ed69e5f 100644 --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc @@ -432,7 +432,7 @@ LenaFdTbfqFfMacSchedulerTestCase1::DoRun() qos.mbrDl = qos.gbrDl; qos.mbrUl = 0; - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q, qos); lteHelper->ActivateDedicatedEpsBearer(ueDevice, bearer, EpcTft::Default()); } @@ -704,7 +704,7 @@ LenaFdTbfqFfMacSchedulerTestCase2::DoRun() qos.mbrDl = qos.gbrDl; qos.mbrUl = 0; - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q, qos); lteHelper->ActivateDedicatedEpsBearer(ueDevice, bearer, EpcTft::Default()); } diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc index 2c4b96f3e..689375394 100644 --- a/src/lte/test/lte-test-phy-error-model.cc +++ b/src/lte/test/lte-test-phy-error-model.cc @@ -205,7 +205,7 @@ LenaDataPhyErrorModelTestCase::DoRun() lena->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lena->ActivateDataRadioBearer(ueDevs, bearer); @@ -366,7 +366,7 @@ LenaDlCtrlPhyErrorModelTestCase::DoRun() lena->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lena->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index cdb7e11b3..531e2a248 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -266,7 +266,7 @@ LenaRrFfMacSchedulerTestCase::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc index c73c5115c..0c20b0a58 100644 --- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc @@ -283,7 +283,7 @@ LenaTdBetFfMacSchedulerTestCase1::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); @@ -467,7 +467,7 @@ LenaTdBetFfMacSchedulerTestCase2::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc index 1b4d3e993..a8caaa131 100644 --- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc @@ -259,7 +259,7 @@ LenaTdMtFfMacSchedulerTestCase::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc index 12c4d2a30..905539129 100644 --- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc @@ -259,7 +259,7 @@ LenaTtaFfMacSchedulerTestCase::DoRun() lteHelper->Attach(ueDevs, enbDevs.Get(0)); // Activate an EPS bearer - enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; + EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE; EpsBearer bearer(q); lteHelper->ActivateDataRadioBearer(ueDevs, bearer); diff --git a/src/lte/test/test-lte-rrc.cc b/src/lte/test/test-lte-rrc.cc index c7a1865ce..69b4d3364 100644 --- a/src/lte/test/test-lte-rrc.cc +++ b/src/lte/test/test-lte-rrc.cc @@ -389,7 +389,7 @@ LteRrcConnectionEstablishmentTestCase::Connect(Ptr ueDevice, PtrActivateDataRadioBearer(ueDevice, bearer); } diff --git a/src/lte/test/test-lte-x2-handover-measures.cc b/src/lte/test/test-lte-x2-handover-measures.cc index c452d85bb..f2cd57d09 100644 --- a/src/lte/test/test-lte-x2-handover-measures.cc +++ b/src/lte/test/test-lte-x2-handover-measures.cc @@ -527,7 +527,7 @@ LteX2HandoverMeasuresTestCase::DoRun() Ptr ueDev = ueDevices.Get(u); for (uint32_t b = 0; b < m_nDedicatedBearers; ++b) { - enum EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT; + EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT; EpsBearer bearer(q); m_lteHelper->ActivateDataRadioBearer(ueDev, bearer); } diff --git a/src/lte/test/test-lte-x2-handover.cc b/src/lte/test/test-lte-x2-handover.cc index 214bdd616..7185b48c3 100644 --- a/src/lte/test/test-lte-x2-handover.cc +++ b/src/lte/test/test-lte-x2-handover.cc @@ -427,7 +427,7 @@ LteX2HandoverTestCase::DoRun() Ptr ueDev = ueDevices.Get(u); for (uint32_t b = 0; b < m_nDedicatedBearers; ++b) { - enum EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT; + EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT; EpsBearer bearer(q); m_lteHelper->ActivateDataRadioBearer(ueDev, bearer); } diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc index 4072c3883..a4952f661 100644 --- a/src/mobility/model/position-allocator.cc +++ b/src/mobility/model/position-allocator.cc @@ -267,7 +267,7 @@ GridPositionAllocator::GetN() const return m_n; } -enum GridPositionAllocator::LayoutType +GridPositionAllocator::LayoutType GridPositionAllocator::GetLayoutType() const { return m_layoutType; diff --git a/src/network/utils/packet-socket.cc b/src/network/utils/packet-socket.cc index e786a3848..f041456a3 100644 --- a/src/network/utils/packet-socket.cc +++ b/src/network/utils/packet-socket.cc @@ -87,14 +87,14 @@ PacketSocket::DoDispose() m_device = 0; } -enum Socket::SocketErrno +Socket::SocketErrno PacketSocket::GetErrno() const { NS_LOG_FUNCTION(this); return m_errno; } -enum Socket::SocketType +Socket::SocketType PacketSocket::GetSocketType() const { NS_LOG_FUNCTION(this); diff --git a/src/stats/model/gnuplot.cc b/src/stats/model/gnuplot.cc index 0ed2f65ae..7d1a512e5 100644 --- a/src/stats/model/gnuplot.cc +++ b/src/stats/model/gnuplot.cc @@ -340,9 +340,9 @@ Gnuplot2dDataset::Data2d::IsEmpty() const // --- Gnuplot2dDataset ---------------------------------------------------- // /// Default plot style static instance -enum Gnuplot2dDataset::Style Gnuplot2dDataset::m_defaultStyle = LINES; +Gnuplot2dDataset::Style Gnuplot2dDataset::m_defaultStyle = LINES; /// Default error bars type static instance -enum Gnuplot2dDataset::ErrorBars Gnuplot2dDataset::m_defaultErrorBars = NONE; +Gnuplot2dDataset::ErrorBars Gnuplot2dDataset::m_defaultErrorBars = NONE; Gnuplot2dDataset::Gnuplot2dDataset(const std::string& title) : GnuplotDataset(new Data2d(title)) diff --git a/src/topology-read/model/rocketfuel-topology-reader.cc b/src/topology-read/model/rocketfuel-topology-reader.cc index 915a54b8f..97ff1e4bf 100644 --- a/src/topology-read/model/rocketfuel-topology-reader.cc +++ b/src/topology-read/model/rocketfuel-topology-reader.cc @@ -319,7 +319,7 @@ RocketfuelTopologyReader::GenerateFromWeightsFile(const std::vector return nodes; } -enum RocketfuelTopologyReader::RF_FileType +RocketfuelTopologyReader::RF_FileType RocketfuelTopologyReader::GetFileType(const std::string& line) { int ret; @@ -352,7 +352,7 @@ RocketfuelTopologyReader::Read() std::istringstream lineBuffer; std::string line; int lineNumber = 0; - enum RF_FileType ftype = RF_UNKNOWN; + RF_FileType ftype = RF_UNKNOWN; if (!topgen.is_open()) { diff --git a/src/wave/model/default-channel-scheduler.cc b/src/wave/model/default-channel-scheduler.cc index e0d9b48bb..2ccbefc07 100644 --- a/src/wave/model/default-channel-scheduler.cc +++ b/src/wave/model/default-channel-scheduler.cc @@ -135,7 +135,7 @@ DefaultChannelScheduler::SetWaveNetDevice(Ptr device) m_coordinator->RegisterListener(m_coordinationListener); } -enum ChannelAccess +ChannelAccess DefaultChannelScheduler::GetAssignedAccessType(uint32_t channelNumber) const { NS_LOG_FUNCTION(this << channelNumber); diff --git a/src/wave/model/vendor-specific-action.cc b/src/wave/model/vendor-specific-action.cc index d73a1cec0..720bb07a1 100644 --- a/src/wave/model/vendor-specific-action.cc +++ b/src/wave/model/vendor-specific-action.cc @@ -113,7 +113,7 @@ OrganizationIdentifier::SetType(OrganizationIdentifierType type) m_type = type; } -enum OrganizationIdentifier::OrganizationIdentifierType +OrganizationIdentifier::OrganizationIdentifierType OrganizationIdentifier::GetType() const { NS_LOG_FUNCTION(this); diff --git a/src/wimax/model/cs-parameters.cc b/src/wimax/model/cs-parameters.cc index f1db2218a..626300172 100644 --- a/src/wimax/model/cs-parameters.cc +++ b/src/wimax/model/cs-parameters.cc @@ -43,7 +43,7 @@ CsParameters::CsParameters(Tlv tlv) { case CsParamVectorTlvValue::Classifier_DSC_Action: { m_classifierDscAction = - (enum CsParameters::Action)((U8TlvValue*)((*iter)->PeekValue()))->GetValue(); + (CsParameters::Action)((U8TlvValue*)((*iter)->PeekValue()))->GetValue(); break; } case CsParamVectorTlvValue::Packet_Classification_Rule: { @@ -54,7 +54,7 @@ CsParameters::CsParameters(Tlv tlv) } } -CsParameters::CsParameters(enum CsParameters::Action classifierDscAction, +CsParameters::CsParameters(CsParameters::Action classifierDscAction, IpcsClassifierRecord classifier) { m_classifierDscAction = classifierDscAction; @@ -62,7 +62,7 @@ CsParameters::CsParameters(enum CsParameters::Action classifierDscAction, } void -CsParameters::SetClassifierDscAction(enum CsParameters::Action action) +CsParameters::SetClassifierDscAction(CsParameters::Action action) { m_classifierDscAction = action; } @@ -73,7 +73,7 @@ CsParameters::SetPacketClassifierRule(IpcsClassifierRecord packetClassifierRule) m_packetClassifierRule = packetClassifierRule; } -enum CsParameters::Action +CsParameters::Action CsParameters::GetClassifierDscAction() const { return m_classifierDscAction; diff --git a/src/wimax/model/service-flow.cc b/src/wimax/model/service-flow.cc index 94af05645..c30677d81 100644 --- a/src/wimax/model/service-flow.cc +++ b/src/wimax/model/service-flow.cc @@ -151,7 +151,7 @@ ServiceFlow::ServiceFlow(Tlv tlv) } case SfVectorTlvValue::CS_Specification: { m_csSpecification = - (enum CsSpecification)(((U8TlvValue*)((*iter)->PeekValue()))->GetValue()); + (CsSpecification)(((U8TlvValue*)((*iter)->PeekValue()))->GetValue()); break; } @@ -246,7 +246,7 @@ ServiceFlow::GetQueue() const return m_connection->GetQueue(); } -enum ServiceFlow::SchedulingType +ServiceFlow::SchedulingType ServiceFlow::GetSchedulingType() const { return m_schedulingType; @@ -362,7 +362,7 @@ ServiceFlow::GetMinTolerableTrafficRate() const return m_minTolerableTrafficRate; } -enum ServiceFlow::SchedulingType +ServiceFlow::SchedulingType ServiceFlow::GetServiceSchedulingType() const { return m_schedulingType; @@ -458,7 +458,7 @@ ServiceFlow::GetArqBlockSize() const return m_arqBlockSize; } -enum ServiceFlow::CsSpecification +ServiceFlow::CsSpecification ServiceFlow::GetCsSpecification() const { return m_csSpecification; @@ -488,7 +488,7 @@ ServiceFlow::GetIsMulticast() const return m_isMulticast; } -enum WimaxPhy::ModulationType +WimaxPhy::ModulationType ServiceFlow::GetModulation() const { return m_modulationType; @@ -545,7 +545,7 @@ ServiceFlow::SetMinTolerableTrafficRate(uint32_t minJitter) } void -ServiceFlow::SetServiceSchedulingType(enum ServiceFlow::SchedulingType schedType) +ServiceFlow::SetServiceSchedulingType(ServiceFlow::SchedulingType schedType) { m_schedulingType = schedType; } @@ -641,7 +641,7 @@ ServiceFlow::SetArqBlockSize(uint16_t size) } void -ServiceFlow::SetCsSpecification(enum ServiceFlow::CsSpecification spec) +ServiceFlow::SetCsSpecification(ServiceFlow::CsSpecification spec) { m_csSpecification = spec; } @@ -671,7 +671,7 @@ ServiceFlow::SetIsMulticast(bool isMulticast) } void -ServiceFlow::SetModulation(enum WimaxPhy::ModulationType modulationType) +ServiceFlow::SetModulation(WimaxPhy::ModulationType modulationType) { m_modulationType = modulationType; } diff --git a/src/wimax/model/ul-job.cc b/src/wimax/model/ul-job.cc index 2737351e3..7a04d7381 100644 --- a/src/wimax/model/ul-job.cc +++ b/src/wimax/model/ul-job.cc @@ -47,7 +47,7 @@ UlJob::SetSsRecord(SSRecord* ssRecord) m_ssRecord = ssRecord; } -enum ServiceFlow::SchedulingType +ServiceFlow::SchedulingType UlJob::GetSchedulingType() { return m_schedulingType; diff --git a/src/wimax/model/ul-job.h b/src/wimax/model/ul-job.h index 693a2d977..4aabb5874 100644 --- a/src/wimax/model/ul-job.h +++ b/src/wimax/model/ul-job.h @@ -73,7 +73,7 @@ class UlJob : public Object * Get scheduling type * \returns the scheduling type */ - enum ServiceFlow::SchedulingType GetSchedulingType(); + ServiceFlow::SchedulingType GetSchedulingType(); /** * Set scheduling type * \param schedulingType the scheduling type @@ -149,11 +149,11 @@ class UlJob : public Object /// equality operator friend bool operator==(const UlJob& a, const UlJob& b); - Time m_releaseTime; ///< The time after which the job can be processed - Time m_period; ///< For periodic jobs - Time m_deadline; ///< Request should be satisfied by this time - uint32_t m_size; ///< Number of minislots requested - enum ServiceFlow::SchedulingType m_schedulingType; ///< Scheduling type of flow + Time m_releaseTime; ///< The time after which the job can be processed + Time m_period; ///< For periodic jobs + Time m_deadline; ///< Request should be satisfied by this time + uint32_t m_size; ///< Number of minislots requested + ServiceFlow::SchedulingType m_schedulingType; ///< Scheduling type of flow SSRecord* m_ssRecord; ///< Pointer to SSRecord diff --git a/src/wimax/model/wimax-connection.cc b/src/wimax/model/wimax-connection.cc index d6e557d9d..d719fd2b5 100644 --- a/src/wimax/model/wimax-connection.cc +++ b/src/wimax/model/wimax-connection.cc @@ -67,7 +67,7 @@ WimaxConnection::GetTypeId() return tid; } -WimaxConnection::WimaxConnection(Cid cid, enum Cid::Type type) +WimaxConnection::WimaxConnection(Cid cid, Cid::Type type) : m_cid(cid), m_cidType(type), m_queue(CreateObject(1024)), @@ -92,7 +92,7 @@ WimaxConnection::GetCid() const return m_cid; } -enum Cid::Type +Cid::Type WimaxConnection::GetType() const { return m_cidType;