X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..5cafe2f3ba05448e2c932bccbe4acd809d7295ec:/src/surf/ns3/red-queue.cc diff --git a/src/surf/ns3/red-queue.cc b/src/surf/ns3/red-queue.cc index 02d68d7e4c..3be1e16d5b 100644 --- a/src/surf/ns3/red-queue.cc +++ b/src/surf/ns3/red-queue.cc @@ -331,7 +331,7 @@ RedQueue::Rmask (uint32_t pLog) { ///> ~OUL creates a 32 bit mask ///> 2^Plog - 1 - return pLog < 32 ? ((1 << pLog) - 1) : ~0UL; + return pLog < 32 ? ((1 << pLog) - 1) : (uint32_t) ~0UL; } @@ -423,7 +423,7 @@ RedQueue::AvgFromIdleTime () if (idleTime > m_scellMax) { - idleTime = m_scellMax; + idleTime = m_scellMax; } NS_LOG_DEBUG ("\t idleTime=" << idleTime); @@ -726,7 +726,7 @@ RedQueue::DropPacket (Ptr p) { packetSize= p->GetSize (); m_packets.erase(iter); - m_bytesInQueue -= packetSize; + m_bytesInQueue -= packetSize; return 1; } }