X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1aeefd997cc362c3b37c1587c5f08891b35c3a75..4bc08995411e21f3564f09e136809be68ddf96a8:/lib/base/eptrlist.h diff --git a/lib/base/eptrlist.h b/lib/base/eptrlist.h index ae61d78d..3c21510d 100644 --- a/lib/base/eptrlist.h +++ b/lib/base/eptrlist.h @@ -161,19 +161,19 @@ public: // 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* v=new std::vector(); - v->reserve( size() ); + v->reserve( std::list::size() ); for ( std_list_T_iterator it( std::list::begin() ); it != std::list::end(); it++) v->push_back( **it ); return v; } - inline iterator insert_in_order( T* e ) - { - // added a new item to the list... in order - // returns a iterator to the new item - return insert( std::lower_bound( std::list::begin(), std::list::end(), e ), e ); - } +// inline iterator insert_in_order( T* e ) +// { +// // added a new item to the list... in order +// // returns a iterator to the new item +// return insert( std::lower_bound( std::list::begin(), std::list::end(), e ), e ); +// } }; @@ -392,7 +392,7 @@ inline void ePtrList::sort() { // Sorts all items in the list. // The type T must have a operator <. - std::list::sort(ePtrList::less()); + std::list::sort(typename ePtrList::less()); } /////////////////// ePtrList remove(T*) ///////////////////////// @@ -624,14 +624,14 @@ template ePtrList::operator bool() { // Returns a bool that contains true, when the list is NOT empty otherwise false - return !empty(); + return !std::list::empty(); } template bool ePtrList::operator!() { // Returns a bool that contains true, when the list is empty otherwise false - return empty(); + return std::list::empty(); } template @@ -791,19 +791,19 @@ public: // 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* v=new std::vector(); - v->reserve( size() ); + v->reserve( std::list::size() ); for ( std_list_T_iterator it( std::list >::begin() ); it != std::list >::end(); it++) v->push_back( **it ); return v; } - inline iterator insert_in_order( T* e ) - { - // added a new item to the list... in order - // returns a iterator to the new item - return insert( std::lower_bound( std::list >::begin(), std::list >::end(), e ), e ); - } +// inline iterator insert_in_order( T* e ) +// { +// // added a new item to the list... in order +// // returns a iterator to the new item +// return insert( std::lower_bound( std::list >::begin(), std::list >::end(), e ), e ); +// } }; @@ -1255,14 +1255,14 @@ template eSmartPtrList::operator bool() { // Returns a bool that contains true, when the list is NOT empty otherwise false - return !empty(); + return !std::list::empty(); } template bool eSmartPtrList::operator!() { // Returns a bool that contains true, when the list is empty otherwise false - return empty(); + return std::list::empty(); } #endif // _E_PTRLIST