aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-01-12 20:51:12 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2005-01-12 20:51:12 +0000
commit50d3596b1c5351f07a7d77bd7d0fcab561884806 (patch)
treec09abc096a0f30e2b9fcb7fa72662f7348e2810c /lib
parentba02fb4aced5868d047a5bffbd2ed87583daee4d (diff)
downloadenigma2-50d3596b1c5351f07a7d77bd7d0fcab561884806.tar.gz
enigma2-50d3596b1c5351f07a7d77bd7d0fcab561884806.zip
fixes for build with new compiler
Diffstat (limited to 'lib')
-rw-r--r--lib/base/eptrlist.h38
-rw-r--r--lib/base/ringbuffer.h2
2 files changed, 20 insertions, 20 deletions
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<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 );
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<T*>::begin(), std::list<T*>::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<T*>::begin(), std::list<T*>::end(), e ), e );
+// }
};
@@ -392,7 +392,7 @@ 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*) /////////////////////////
@@ -624,14 +624,14 @@ template <class 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();
+ return std::list<T*>::empty();
}
template <class T>
@@ -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<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 );
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<ePtr<T> >::begin(), std::list<ePtr<T> >::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<ePtr<T> >::begin(), std::list<ePtr<T> >::end(), e ), e );
+// }
};
@@ -1255,14 +1255,14 @@ template <class 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();
+ return std::list<T>::empty();
}
#endif // _E_PTRLIST
diff --git a/lib/base/ringbuffer.h b/lib/base/ringbuffer.h
index f2cd9058..e9fc4d68 100644
--- a/lib/base/ringbuffer.h
+++ b/lib/base/ringbuffer.h
@@ -91,7 +91,7 @@ void queueRingBuffer<T>::enqueue( const T &val )
// first check for potential overflow
if( lastFilled->nextLink == lastFree )
{
- eDebug("increase size %d", count);
+// eDebug("increase size %d", count);
link<T> * newLink = new link<T>( val );
newLink->prevLink = lastFilled;
newLink->nextLink = lastFilled->nextLink;