#include <list>
#include <vector>
+#include <algorithm>
#include <lib/base/smartptr.h>
template <class T>
inline operator bool();
inline bool operator!();
-// added methods for autodelete implementation
- inline void setAutoDelete(bool b);
- inline bool isAutoDelete();
-
// added compare struct ... to sort
struct less;
private:
iterator cur;
- bool autoDelete;
-
public:
- iterator ePtrList<T>::begin()
+ iterator begin()
{
// makes implicit type conversion form std::list::iterator to ePtrList::iterator
return std::list<T*>::begin();
}
- iterator ePtrList<T>::end()
+ iterator end()
{
// makes implicit type conversion form std::list::iterator to ePtrList::iterator
return std::list<T*>::end();
}
- const_iterator ePtrList<T>::begin() const
+ const_iterator begin() const
{
// makes implicit type conversion form std::list::const_iterator to ePtrList::const_iterator
return std::list<T*>::begin();
}
- const_iterator ePtrList<T>::end() const
+ const_iterator end() const
{
// makes implicit type conversion form std::list::const_iterator to ePtrList::const_iterator
return std::list<T*>::end();
}
- reverse_iterator ePtrList<T>::rbegin()
+ reverse_iterator rbegin()
{
// makes implicit type conversion form std::list::reverse:_iterator to ePtrList::reverse_iterator
return std::list<T*>::rbegin();
}
- reverse_iterator ePtrList<T>::rend()
+ reverse_iterator rend()
{
// makes implicit type conversion form std::list::reverse_iterator to ePtrList::reverse_iterator
return std::list<T*>::rend();
}
- const_reverse_iterator ePtrList<T>::rbegin() const
+ const_reverse_iterator rbegin() const
{
// makes implicit type conversion form std::list::const_reverse_iterator to ePtrList::const_reverse_iterator
return std::list<T*>::rbegin();
}
- const_reverse_iterator ePtrList<T>::rend() const
+ const_reverse_iterator rend() const
{
// makes implicit type conversion form std::list::const_reverse_iterator to ePtrList::const_reverse_iterator
return std::list<T*>::rend();
}
- iterator ePtrList<T>::erase(iterator it)
+ iterator erase(iterator it)
{
// Remove the item it, if auto-deletion is enabled, than the list call delete for this item
// If current is equal to the item that was removed, current is set to the next item in the list
- if (autoDelete && *it)
- delete *it;
-
if (cur == it)
return cur = std::list<T*>::erase(it);
else
return std::list<T*>::erase(it);
}
- iterator ePtrList<T>::erase(iterator from, iterator to)
+ iterator erase(iterator from, iterator to)
{
// Remove all items between the to iterators from and to
// If auto-deletion is enabled, than the list call delete for all removed items
// Creates an vector and copys all elements to this vector
// returns a pointer to this new vector ( the reserved memory must deletet from the receiver !! )
std::vector<T>* v=new std::vector<T>();
- v->reserve( size() );
+ v->reserve( std::list<T>::size() );
for ( std_list_T_iterator it( std::list<T*>::begin() ); it != std::list<T*>::end(); it++)
v->push_back( **it );
{
// added a new item to the list... in order
// returns a iterator to the new item
- return insert( std::lower_bound( std::list<T*>::begin(), std::list<T*>::end(), e ), e );
+ return insert( std::lower_bound( std::list<T*>::begin(), std::list<T*>::end(), e, less()), e );
}
};
/////////////////// Default Constructor /////////////////////////////
template <class T>
ePtrList<T>::ePtrList()
- :cur(std::list<T*>::begin()), autoDelete(false)
+ :cur(std::list<T*>::begin())
{
}
/////////////////// Copy Constructor /////////////////////////////
template <class T>
ePtrList<T>::ePtrList(const ePtrList& e)
- :std::list<T*>(e), cur(e.cur), autoDelete( false )
+ :std::list<T*>(e), cur(e.cur)
{
- if ( e.autoDelete )
- if ( e.size() )
- eDebug("Warning !! We make a Copy of a non empty ePtrList, with autoDelete enabled"
- "We disable autoDelete in the new ePtrList !!");
- else
- autoDelete=true;
}
/////////////////// ePtrList Destructor /////////////////////////////
template <class T>
inline ePtrList<T>::~ePtrList()
{
-// if autoDelete is enabled, delete is called for all elements in the list
- if (autoDelete)
- for (std_list_T_iterator it(std::list<T*>::begin()); it != std::list<T*>::end(); it++)
- delete *it;
}
-
/////////////////// ePtrList sort() /////////////////////////
template <class T>
inline void ePtrList<T>::sort()
{
// Sorts all items in the list.
// The type T must have a operator <.
- std::list<T*>::sort(ePtrList<T>::less());
+ std::list<T*>::sort(typename ePtrList<T>::less());
}
/////////////////// ePtrList remove(T*) /////////////////////////
ePtrList<T>::operator bool()
{
// Returns a bool that contains true, when the list is NOT empty otherwise false
- return !empty();
+ return !std::list<T*>::empty();
}
template <class T>
bool ePtrList<T>::operator!()
{
// Returns a bool that contains true, when the list is empty otherwise false
- return empty();
-}
-
-template <class T>
-void ePtrList<T>::setAutoDelete(bool b)
-{
-// switched autoDelete on or off
-// if autoDelete is true, than the pointer list controls the heap memory behind the pointer itself
-// the list calls delete for the item before it removed from the list
- autoDelete=b;
-}
-
-template <class T>
-bool ePtrList<T>::isAutoDelete()
-{
-// returns a bool that contains the state of autoDelete
- return autoDelete;
+ return std::list<T*>::empty();
}
template <class T>
inline operator bool();
inline bool operator!();
-// added methods for autodelete implementation
- inline void setAutoDelete(bool b);
- inline bool isAutoDelete();
-
// added compare struct ... to sort
struct less;
private:
iterator cur;
- bool autoDelete;
-
public:
- iterator eSmartPtrList<T>::begin()
+ iterator begin()
{
// makes implicit type conversion form std::list::iterator to eSmartPtrList::iterator
return std::list<ePtr<T> >::begin();
}
- iterator eSmartPtrList<T>::end()
+ iterator end()
{
// makes implicit type conversion form std::list::iterator to eSmartPtrList::iterator
return std::list<ePtr<T> >::end();
}
- const_iterator eSmartPtrList<T>::begin() const
+ const_iterator begin() const
{
// makes implicit type conversion form std::list::const_iterator to eSmartPtrList::const_iterator
return std::list<ePtr<T> >::begin();
}
- const_iterator eSmartPtrList<T>::end() const
+ const_iterator end() const
{
// makes implicit type conversion form std::list::const_iterator to eSmartPtrList::const_iterator
return std::list<ePtr<T> >::end();
}
- reverse_iterator eSmartPtrList<T>::rbegin()
+ reverse_iterator rbegin()
{
// makes implicit type conversion form std::list::reverse:_iterator to eSmartPtrList::reverse_iterator
return std::list<ePtr<T> >::rbegin();
}
- reverse_iterator eSmartPtrList<T>::rend()
+ reverse_iterator rend()
{
// makes implicit type conversion form std::list::reverse_iterator to eSmartPtrList::reverse_iterator
return std::list<ePtr<T> >::rend();
}
- const_reverse_iterator eSmartPtrList<T>::rbegin() const
+ const_reverse_iterator rbegin() const
{
// makes implicit type conversion form std::list::const_reverse_iterator to eSmartPtrList::const_reverse_iterator
return std::list<ePtr<T> >::rbegin();
}
- const_reverse_iterator eSmartPtrList<T>::rend() const
+ const_reverse_iterator rend() const
{
// makes implicit type conversion form std::list::const_reverse_iterator to eSmartPtrList::const_reverse_iterator
return std::list<ePtr<T> >::rend();
}
- iterator eSmartPtrList<T>::erase(iterator it)
+ iterator erase(iterator it)
{
// Remove the item it, if auto-deletion is enabled, than the list call delete for this item
// If current is equal to the item that was removed, current is set to the next item in the list
- if (autoDelete && *it)
- delete *it;
if (cur == it)
return cur = std::list<ePtr<T> >::erase(it);
return std::list<ePtr<T> >::erase(it);
}
- iterator eSmartPtrList<T>::erase(iterator from, iterator to)
+ iterator erase(iterator from, iterator to)
{
// Remove all items between the to iterators from and to
// If auto-deletion is enabled, than the list call delete for all removed items
// Creates an vector and copys all elements to this vector
// returns a pointer to this new vector ( the reserved memory must deletet from the receiver !! )
std::vector<T>* v=new std::vector<T>();
- v->reserve( size() );
+ v->reserve( std::list<T>::size() );
for ( std_list_T_iterator it( std::list<ePtr<T> >::begin() ); it != std::list<ePtr<T> >::end(); it++)
v->push_back( **it );
{
// added a new item to the list... in order
// returns a iterator to the new item
- return insert( std::lower_bound( std::list<ePtr<T> >::begin(), std::list<ePtr<T> >::end(), e ), e );
+ return insert( std::lower_bound( std::list<ePtr<T> >::begin(), e, std::list<ePtr<T> >::end()), e );
}
};
/////////////////// Default Constructor /////////////////////////////
template <class T>
eSmartPtrList<T>::eSmartPtrList()
- :cur(std::list<ePtr<T> >::begin()), autoDelete(false)
+ :cur(std::list<ePtr<T> >::begin())
{
}
/////////////////// Copy Constructor /////////////////////////////
template <class T>
eSmartPtrList<T>::eSmartPtrList(const eSmartPtrList& e)
- :std::list<ePtr<T> >(e), cur(e.cur), autoDelete( false )
+ :std::list<ePtr<T> >(e), cur(e.cur)
{
- if ( e.autoDelete )
- if ( e.size() )
- eDebug("Warning !! We make a Copy of a non empty eSmartPtrList, with autoDelete enabled"
- "We disable autoDelete in the new eSmartPtrList !!");
- else
- autoDelete=true;
}
/////////////////// eSmartPtrList Destructor /////////////////////////////
template <class T>
inline eSmartPtrList<T>::~eSmartPtrList()
{
-// if autoDelete is enabled, delete is called for all elements in the list
- if (autoDelete)
- for (std_list_T_iterator it(std::list<ePtr<T> >::begin()); it != std::list<ePtr<T> >::end(); it++)
- delete *it;
}
first();
}
-/////////////////// eSmartPtrList take() ////////////////////
-//template <class T>
-//inline T* eSmartPtrList<T>::take()
-//{
-//// Takes the current item out of the list without deleting it (even if auto-deletion is enabled).
-//// Returns a pointer to the item taken out of the list, or null if the index is out of range.
-//// The item after the taken item becomes the new current list item if the taken item is not the last item in the list. If the last item is taken, the new last item becomes the current item.
-//// The current item is set to null if the list becomes empty.
-// T* tmp = *cur;
-// cur = std::list<T*>::erase(cur);
-// return tmp;
-//}
-
-/////////////////// eSmartPtrList take(T*) ////////////////////
-//template <class T>
-//inline void eSmartPtrList<T>::take(T* t)
-//{
-//// Takes all item with T* out of the list without deleting it (even if auto-deletion is enabled).
-// std::list<T*>::remove(t);
-//}
-
/////////////////// eSmartPtrList setCurrent(T*) ////////////////////
template <class T>
inline T* eSmartPtrList<T>::setCurrent(const T* t)
eSmartPtrList<T>::operator bool()
{
// Returns a bool that contains true, when the list is NOT empty otherwise false
- return !empty();
+ return !std::list<T>::empty();
}
template <class T>
bool eSmartPtrList<T>::operator!()
{
// Returns a bool that contains true, when the list is empty otherwise false
- return empty();
-}
-
-template <class T>
-void eSmartPtrList<T>::setAutoDelete(bool b)
-{
-// switched autoDelete on or off
-// if autoDelete is true, than the pointer list controls the heap memory behind the pointer itself
-// the list calls delete for the item before it removed from the list
- autoDelete=b;
-}
-
-template <class T>
-bool eSmartPtrList<T>::isAutoDelete()
-{
-// returns a bool that contains the state of autoDelete
- return autoDelete;
+ return std::list<T>::empty();
}
#endif // _E_PTRLIST
git.cweiske.de / enigma2.git / blobdiff