bug 275: Queue::Peek should return Ptr<const Packet>
This commit is contained in:
@@ -1027,9 +1027,9 @@ def register_Ns3Queue_methods(root_module, cls):
|
||||
cls.add_method('Dequeue',
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
[])
|
||||
## queue.h: ns3::Ptr<ns3::Packet> ns3::Queue::Peek() const [member function]
|
||||
## queue.h: ns3::Ptr<const ns3::Packet> ns3::Queue::Peek() const [member function]
|
||||
cls.add_method('Peek',
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
'ns3::Ptr<const ns3::Packet >',
|
||||
[],
|
||||
is_const=True)
|
||||
## queue.h: void ns3::Queue::DequeueAll() [member function]
|
||||
@@ -1085,9 +1085,9 @@ def register_Ns3Queue_methods(root_module, cls):
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
[],
|
||||
is_pure_virtual=True, visibility='private', is_virtual=True)
|
||||
## queue.h: ns3::Ptr<ns3::Packet> ns3::Queue::DoPeek() const [member function]
|
||||
## queue.h: ns3::Ptr<const ns3::Packet> ns3::Queue::DoPeek() const [member function]
|
||||
cls.add_method('DoPeek',
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
'ns3::Ptr<const ns3::Packet >',
|
||||
[],
|
||||
is_pure_virtual=True, is_const=True, visibility='private', is_virtual=True)
|
||||
return
|
||||
@@ -1590,9 +1590,9 @@ def register_Ns3DropTailQueue_methods(root_module, cls):
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
[],
|
||||
visibility='private', is_virtual=True)
|
||||
## drop-tail-queue.h: ns3::Ptr<ns3::Packet> ns3::DropTailQueue::DoPeek() const [member function]
|
||||
## drop-tail-queue.h: ns3::Ptr<const ns3::Packet> ns3::DropTailQueue::DoPeek() const [member function]
|
||||
cls.add_method('DoPeek',
|
||||
'ns3::Ptr< ns3::Packet >',
|
||||
'ns3::Ptr<const ns3::Packet >',
|
||||
[],
|
||||
is_const=True, visibility='private', is_virtual=True)
|
||||
return
|
||||
|
||||
@@ -87,7 +87,7 @@ DropTailQueue::DoDequeue (void)
|
||||
return p;
|
||||
}
|
||||
|
||||
Ptr<Packet>
|
||||
Ptr<const Packet>
|
||||
DropTailQueue::DoPeek (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
|
||||
@@ -47,7 +47,7 @@ public:
|
||||
private:
|
||||
virtual bool DoEnqueue (Ptr<Packet> p);
|
||||
virtual Ptr<Packet> DoDequeue (void);
|
||||
virtual Ptr<Packet> DoPeek (void) const;
|
||||
virtual Ptr<const Packet> DoPeek (void) const;
|
||||
|
||||
private:
|
||||
std::queue<Ptr<Packet> > m_packets;
|
||||
|
||||
@@ -107,7 +107,7 @@ Queue::DequeueAll (void)
|
||||
}
|
||||
}
|
||||
|
||||
Ptr<Packet>
|
||||
Ptr<const Packet>
|
||||
Queue::Peek (void) const
|
||||
{
|
||||
NS_LOG_FUNCTION (this);
|
||||
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
* Get a copy of the item at the front of the queue without removing it
|
||||
* \return 0 if the operation was not successful; the packet otherwise.
|
||||
*/
|
||||
Ptr<Packet> Peek (void) const;
|
||||
Ptr<const Packet> Peek (void) const;
|
||||
|
||||
/**
|
||||
* Flush the queue.
|
||||
@@ -142,7 +142,7 @@ private:
|
||||
|
||||
virtual bool DoEnqueue (Ptr<Packet> p) = 0;
|
||||
virtual Ptr<Packet> DoDequeue (void) = 0;
|
||||
virtual Ptr<Packet> DoPeek (void) const = 0;
|
||||
virtual Ptr<const Packet> DoPeek (void) const = 0;
|
||||
|
||||
protected:
|
||||
// called by subclasses to notify parent of packet drops.
|
||||
|
||||
Reference in New Issue
Block a user