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

network: Remove begin() and end() from Queue class

Browse Source 
begin() and end() are not necessarily meaningful for all the containers.
A GetContainer() method returning a const reference to the container is
added, so that begin() and end() can be called through it.
This commit is contained in:
Stefano Avallone
2021-10-18 20:02:45 +02:00
parent e5805a53fb
commit 7c73228e78
6 changed files with 47 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/network/utils/queue.h
View File

@@ -313,68 +313,11 @@ protected:
typedef typename Container::iterator Iterator;
/**
* \brief Get a const iterator which refers to the first item in the queue.
* Get a const reference to the container of queue items.
*
* Subclasses can browse the items in the queue by using a const iterator
*
* \code
* for (auto i = begin (); i != end (); ++i)
* {
* (*i)->method (); // some const method of the Item class
* }
* \endcode
*
* \returns a const iterator which refers to the first item in the queue.
* \return a const reference to the container of queue items
*/
ConstIterator begin (void) const;
/**
* \brief Get an iterator which refers to the first item in the queue.
*
* Subclasses can browse the items in the queue by using an iterator
*
* \code
* for (auto i = begin (); i != end (); ++i)
* {
* (*i)->method (); // some method of the Item class
* }
* \endcode
*
* \returns an iterator which refers to the first item in the queue.
*/
Iterator begin (void);
/**
* \brief Get a const iterator which indicates past-the-last item in the queue.
*
* Subclasses can browse the items in the queue by using a const iterator
*
* \code
* for (auto i = begin (); i != end (); ++i)
* {
* (*i)->method (); // some const method of the Item class
* }
* \endcode
*
* \returns a const iterator which indicates past-the-last item in the queue.
*/
ConstIterator end (void) const;
/**
* \brief Get an iterator which indicates past-the-last item in the queue.
*
* Subclasses can browse the items in the queue by using an iterator
*
* \code
* for (auto i = begin (); i != end (); ++i)
* {
* (*i)->method (); // some method of the Item class
* }
* \endcode
*
* \returns an iterator which indicates past-the-last item in the queue.
*/
Iterator end (void);
const Container& GetContainer (void) const;
/**
* Push an item in the queue
@@ -500,6 +443,13 @@ Queue<Item, Container>::~Queue ()
{
}
template <typename Item, typename Container>
const Container&
Queue<Item, Container>::GetContainer (void) const
{
return m_packets;
}
template <typename Item, typename Container>
bool
Queue<Item, Container>::DoEnqueue (ConstIterator pos, Ptr<Item> item)
@@ -632,30 +582,6 @@ Queue<Item, Container>::DoPeek (ConstIterator pos) const
return *pos;
}
template <typename Item, typename Container>
typename Queue<Item, Container>::ConstIterator Queue<Item, Container>::begin (void) const
{
return m_packets.cbegin ();
}
template <typename Item, typename Container>
typename Queue<Item, Container>::Iterator Queue<Item, Container>::begin (void)
{
return m_packets.begin ();
}
template <typename Item, typename Container>
typename Queue<Item, Container>::ConstIterator Queue<Item, Container>::end (void) const
{
return m_packets.cend ();
}
template <typename Item, typename Container>
typename Queue<Item, Container>::Iterator Queue<Item, Container>::end (void)
{
return m_packets.end ();
}
template <typename Item, typename Container>
void
Queue<Item, Container>::DropBeforeEnqueue (Ptr<Item> item)