diff --git a/src/traffic-control/model/pfifo-fast-queue-disc.cc b/src/traffic-control/model/pfifo-fast-queue-disc.cc index 67b0d8e53..b2bbf9258 100644 --- a/src/traffic-control/model/pfifo-fast-queue-disc.cc +++ b/src/traffic-control/model/pfifo-fast-queue-disc.cc @@ -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 item) @@ -81,12 +81,12 @@ PfifoFastQueueDisc::DoEnqueue (Ptr 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; } diff --git a/src/traffic-control/model/pfifo-fast-queue-disc.h b/src/traffic-control/model/pfifo-fast-queue-disc.h index 8a7ec3d86..7ebd3aabe 100644 --- a/src/traffic-control/model/pfifo-fast-queue-disc.h +++ b/src/traffic-control/model/pfifo-fast-queue-disc.h @@ -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 item); virtual Ptr DoDequeue (void); virtual Ptr DoPeek (void) const;