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

traffic-control: fix gcc 4.8.4 error

Browse Source
This commit is contained in:
Stefano Avallone
2016-07-16 23:19:27 +02:00
parent 686a9a7852
commit 520a73c069
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/traffic-control/model/pfifo-fast-queue-disc.cc
View File

@@ -58,7 +58,7 @@ PfifoFastQueueDisc::~PfifoFastQueueDisc ()
NS_LOG_FUNCTION (this);
}
constexpr int PfifoFastQueueDisc::prio2band[];
const uint32_t PfifoFastQueueDisc::prio2band[16] = {1, 2, 2, 2, 1, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
bool
PfifoFastQueueDisc::DoEnqueue (Ptr<QueueDiscItem> item)
@@ -81,12 +81,12 @@ PfifoFastQueueDisc::DoEnqueue (Ptr<QueueDiscItem> item)
uint32_t band = prio2band[priority & 0x0f];
bool retval = GetInternalQueue(band)->Enqueue (item);
bool retval = GetInternalQueue (band)->Enqueue (item);
// If Queue::Enqueue fails, QueueDisc::Drop is called by the internal queue
// because QueueDisc::AddInternalQueue sets the drop callback
NS_LOG_LOGIC ("Number packets band " << band << ": " << GetInternalQueue(band)->GetNPackets ());
NS_LOG_LOGIC ("Number packets band " << band << ": " << GetInternalQueue (band)->GetNPackets ());
return retval;
}

4
src/traffic-control/model/pfifo-fast-queue-disc.h
View File

@@ -62,12 +62,12 @@ public:
virtual ~PfifoFastQueueDisc();
private:
/**
* Priority to band map
*/
static constexpr int prio2band[] = {1, 2, 2, 2, 1, 2, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
static const uint32_t prio2band[16];
private:
virtual bool DoEnqueue (Ptr<QueueDiscItem> item);
virtual Ptr<QueueDiscItem> DoDequeue (void);
virtual Ptr<const QueueDiscItem> DoPeek (void) const;