F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary enum specifiers

Browse Source
This commit is contained in:
Eduardo Almeida
2023-04-30 18:26:33 +00:00
parent 2be719791c
commit 68ef2890d0
36 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/model/time.cc
View File

@@ -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<<

2
src/core/model/timer.cc
View File

@@ -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);

7
src/dsr/model/dsr-routing.cc
View File

@@ -3533,7 +3533,7 @@ DsrRouting::SendAck(uint16_t ackId,
}
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
DsrRouting::Receive(Ptr<Packet> p, const Ipv4Header& ip, Ptr<Ipv4Interface> incomingInterface)
{
NS_LOG_FUNCTION(this << p << ip << incomingInterface);
@@ -3677,8 +3677,7 @@ DsrRouting::Receive(Ptr<Packet> p, const Ipv4Header& ip, Ptr<Ipv4Interface> 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<Packet> p, const Ipv4Header& ip, Ptr<Ipv4Interface> inco
return IpL4Protocol::RX_OK;
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
DsrRouting::Receive(Ptr<Packet> p, const Ipv6Header& ip, Ptr<Ipv6Interface> incomingInterface)
{
NS_LOG_FUNCTION(this << p << ip.GetSource() << ip.GetDestination() << incomingInterface);

4
src/internet/model/icmpv4-l4-protocol.cc
View File

@@ -289,7 +289,7 @@ Icmpv4L4Protocol::HandleTimeExceeded(Ptr<Packet> p,
Forward(source, icmp, 0, ipHeader, payload);
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
Icmpv4L4Protocol::Receive(Ptr<Packet> p,
const Ipv4Header& header,
Ptr<Ipv4Interface> incomingInterface)
@@ -342,7 +342,7 @@ Icmpv4L4Protocol::Receive(Ptr<Packet> p,
return IpL4Protocol::RX_OK;
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
Icmpv4L4Protocol::Receive(Ptr<Packet> p,
const Ipv6Header& header,
Ptr<Ipv6Interface> incomingInterface)

4
src/internet/model/icmpv6-l4-protocol.cc
View File

@@ -284,7 +284,7 @@ Icmpv6L4Protocol::DoDAD(Ipv6Address target, Ptr<Ipv6Interface> interface)
Ipv6Address::MakeSolicitedAddress(target));
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
Icmpv6L4Protocol::Receive(Ptr<Packet> packet,
const Ipv4Header& header,
Ptr<Ipv4Interface> interface)
@@ -293,7 +293,7 @@ Icmpv6L4Protocol::Receive(Ptr<Packet> packet,
return IpL4Protocol::RX_ENDPOINT_UNREACH;
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
Icmpv6L4Protocol::Receive(Ptr<Packet> packet,
const Ipv6Header& header,
Ptr<Ipv6Interface> interface)

4
src/internet/model/ipv4-raw-socket-impl.cc
View File

@@ -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);

4
src/internet/model/ipv6-raw-socket-impl.cc
View File

@@ -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;

6
src/internet/model/tcp-l4-protocol.cc
View File

@@ -380,7 +380,7 @@ TcpL4Protocol::ReceiveIcmp(Ipv6Address icmpSource,
}
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
TcpL4Protocol::PacketReceived(Ptr<Packet> packet,
TcpHeader& incomingTcpHeader,
const Address& source,
@@ -448,7 +448,7 @@ TcpL4Protocol::NoEndPointsFound(const TcpHeader& incomingHeader,
}
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
TcpL4Protocol::Receive(Ptr<Packet> packet,
const Ipv4Header& incomingIpHeader,
Ptr<Ipv4Interface> incomingInterface)
@@ -519,7 +519,7 @@ TcpL4Protocol::Receive(Ptr<Packet> packet,
return IpL4Protocol::RX_OK;
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
TcpL4Protocol::Receive(Ptr<Packet> packet,
const Ipv6Header& incomingIpHeader,
Ptr<Ipv6Interface> interface)

4
src/internet/model/tcp-socket-base.cc
View File

@@ -513,14 +513,14 @@ TcpSocketBase::SetRtt(Ptr<RttEstimator> 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;

4
src/internet/model/udp-l4-protocol.cc
View File

@@ -328,7 +328,7 @@ UdpL4Protocol::ReceiveIcmp(Ipv6Address icmpSource,
}
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
UdpL4Protocol::Receive(Ptr<Packet> packet, const Ipv4Header& header, Ptr<Ipv4Interface> interface)
{
NS_LOG_FUNCTION(this << packet << header);
@@ -387,7 +387,7 @@ UdpL4Protocol::Receive(Ptr<Packet> packet, const Ipv4Header& header, Ptr<Ipv4Int
return IpL4Protocol::RX_OK;
}
enum IpL4Protocol::RxStatus
IpL4Protocol::RxStatus
UdpL4Protocol::Receive(Ptr<Packet> packet, const Ipv6Header& header, Ptr<Ipv6Interface> interface)
{
NS_LOG_FUNCTION(this << packet << header.GetSource() << header.GetDestination());

4
src/internet/model/udp-socket-impl.cc
View File

@@ -153,14 +153,14 @@ UdpSocketImpl::SetUdp(Ptr<UdpL4Protocol> 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;

2
src/lr-wpan/model/lr-wpan-mac-header.cc
View File

@@ -58,7 +58,7 @@ LrWpanMacHeader::~LrWpanMacHeader()
{
}
enum LrWpanMacHeader::LrWpanMacType
LrWpanMacHeader::LrWpanMacType
LrWpanMacHeader::GetType() const
{
switch (m_fctrlFrmType)

5
src/lte/model/ff-mac-common.h
View File

@@ -269,7 +269,7 @@ struct BuildDataListElement_s
{
uint16_t m_rnti{UINT16_MAX}; ///< RNTI
struct DlDciListElement_s m_dci; ///< DCI
std::vector<enum CeBitmap_e> m_ceBitmap; ///< CE bitmap
std::vector<CeBitmap_e> m_ceBitmap; ///< CE bitmap
std::vector<std::vector<struct RlcPduListElement_s>> m_rlcPduList; ///< RLC PDU list
};
@@ -474,7 +474,8 @@ struct DlInfoListElement_s
NACK,
DTX
};
std::vector<enum HarqStatus_e> m_harqStatus; ///< HARQ status
std::vector<HarqStatus_e> m_harqStatus; ///< HARQ status
};
/**

4
src/lte/test/lte-test-cqa-ff-mac-scheduler.cc
View File

@@ -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());
}

2
src/lte/test/lte-test-deactivate-bearer.cc
View File

@@ -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;

4
src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc
View File

@@ -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);

4
src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc
View File

@@ -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());
}

4
src/lte/test/lte-test-phy-error-model.cc
View File

@@ -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);

2
src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -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);

4
src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc
View File

@@ -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);

2
src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc
View File

@@ -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);

2
src/lte/test/lte-test-tta-ff-mac-scheduler.cc
View File

@@ -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);

2
src/lte/test/test-lte-rrc.cc
View File

@@ -389,7 +389,7 @@ LteRrcConnectionEstablishmentTestCase::Connect(Ptr<NetDevice> ueDevice, Ptr<NetD
for (uint32_t b = 0; b < m_nBearers; ++b)
{
enum EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT;
EpsBearer::Qci q = EpsBearer::NGBR_VIDEO_TCP_DEFAULT;
EpsBearer bearer(q);
m_lteHelper->ActivateDataRadioBearer(ueDevice, bearer);
}

2
src/lte/test/test-lte-x2-handover-measures.cc
View File

@@ -527,7 +527,7 @@ LteX2HandoverMeasuresTestCase::DoRun()
Ptr<NetDevice> 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);
}

2
src/lte/test/test-lte-x2-handover.cc
View File

@@ -427,7 +427,7 @@ LteX2HandoverTestCase::DoRun()
Ptr<NetDevice> 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);
}

2
src/mobility/model/position-allocator.cc
View File

@@ -267,7 +267,7 @@ GridPositionAllocator::GetN() const
return m_n;
}
enum GridPositionAllocator::LayoutType
GridPositionAllocator::LayoutType
GridPositionAllocator::GetLayoutType() const
{
return m_layoutType;

4
src/network/utils/packet-socket.cc
View File

@@ -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);

4
src/stats/model/gnuplot.cc
View File

@@ -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))

4
src/topology-read/model/rocketfuel-topology-reader.cc
View File

@@ -319,7 +319,7 @@ RocketfuelTopologyReader::GenerateFromWeightsFile(const std::vector<std::string>
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())
{

2
src/wave/model/default-channel-scheduler.cc
View File

@@ -135,7 +135,7 @@ DefaultChannelScheduler::SetWaveNetDevice(Ptr<WaveNetDevice> device)
m_coordinator->RegisterListener(m_coordinationListener);
}
enum ChannelAccess
ChannelAccess
DefaultChannelScheduler::GetAssignedAccessType(uint32_t channelNumber) const
{
NS_LOG_FUNCTION(this << channelNumber);

2
src/wave/model/vendor-specific-action.cc
View File

@@ -113,7 +113,7 @@ OrganizationIdentifier::SetType(OrganizationIdentifierType type)
m_type = type;
}
enum OrganizationIdentifier::OrganizationIdentifierType
OrganizationIdentifier::OrganizationIdentifierType
OrganizationIdentifier::GetType() const
{
NS_LOG_FUNCTION(this);

8
src/wimax/model/cs-parameters.cc
View File

@@ -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;

16
src/wimax/model/service-flow.cc
View File

@@ -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;
}

2
src/wimax/model/ul-job.cc
View File

@@ -47,7 +47,7 @@ UlJob::SetSsRecord(SSRecord* ssRecord)
m_ssRecord = ssRecord;
}
enum ServiceFlow::SchedulingType
ServiceFlow::SchedulingType
UlJob::GetSchedulingType()
{
return m_schedulingType;

12
src/wimax/model/ul-job.h
View File

@@ -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

4
src/wimax/model/wimax-connection.cc
View File

@@ -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<WimaxMacQueue>(1024)),
@@ -92,7 +92,7 @@ WimaxConnection::GetCid() const
return m_cid;
}
enum Cid::Type
Cid::Type
WimaxConnection::GetType() const
{
return m_cidType;