From ede8809e4af24bf8c821173bc124db7e2992366d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Thu, 17 Jun 2004 12:37:40 +0000 Subject: [PATCH] This fixes several "implicit typename" warnings with GCC 3. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8023 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/util/Vector.h | 29 ++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/headers/private/kernel/util/Vector.h b/headers/private/kernel/util/Vector.h index 5548d76325..f078fd2700 100644 --- a/headers/private/kernel/util/Vector.h +++ b/headers/private/kernel/util/Vector.h @@ -39,6 +39,7 @@ template class VectorIterator; // for convenience #define _VECTOR_TEMPLATE_LIST template #define _VECTOR_CLASS_NAME Vector +#define _VECTOR_CLASS_TYPE typename Vector /*! \class Vector @@ -382,7 +383,7 @@ _VECTOR_CLASS_NAME::Remove(const Value &value) removed), or Null(), if \a index was out of range. */ _VECTOR_TEMPLATE_LIST -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Erase(int32 index) { if (index >= 0 && index < fItemCount) { @@ -403,7 +404,7 @@ _VECTOR_CLASS_NAME::Erase(int32 index) (in this case including End()). */ _VECTOR_TEMPLATE_LIST -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Erase(const Iterator &iterator) { int32 index = _IteratorIndex(iterator); @@ -458,7 +459,7 @@ _VECTOR_CLASS_NAME::MakeEmpty() */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Begin() { return Iterator(fItems); @@ -474,7 +475,7 @@ _VECTOR_CLASS_NAME::Begin() */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::Begin() const { return ConstIterator(fItems); @@ -490,7 +491,7 @@ _VECTOR_CLASS_NAME::Begin() const */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::End() { return Iterator(fItems + fItemCount); @@ -506,7 +507,7 @@ _VECTOR_CLASS_NAME::End() */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::End() const { return ConstIterator(fItems + fItemCount); @@ -522,7 +523,7 @@ _VECTOR_CLASS_NAME::End() const */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Null() { return Iterator(NULL); @@ -538,7 +539,7 @@ _VECTOR_CLASS_NAME::Null() */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::Null() const { return ConstIterator(NULL); @@ -551,7 +552,7 @@ _VECTOR_CLASS_NAME::Null() const */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::IteratorForIndex(int32 index) { if (index >= 0 && index <= fItemCount) @@ -566,7 +567,7 @@ _VECTOR_CLASS_NAME::IteratorForIndex(int32 index) */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::IteratorForIndex(int32 index) const { if (index >= 0 && index <= fItemCount) @@ -637,7 +638,7 @@ _VECTOR_CLASS_NAME::IndexOf(const Value &value, int32 start) const */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Find(const Value &value) { return Find(value, Begin()); @@ -654,7 +655,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value) invalid. */ _VECTOR_TEMPLATE_LIST -_VECTOR_CLASS_NAME::Iterator +_VECTOR_CLASS_TYPE::Iterator _VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start) { int32 index = IndexOf(value, _IteratorIndex(start)); @@ -672,7 +673,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start) */ _VECTOR_TEMPLATE_LIST inline -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::Find(const Value &value) const { return Find(value, Begin()); @@ -689,7 +690,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value) const invalid. */ _VECTOR_TEMPLATE_LIST -_VECTOR_CLASS_NAME::ConstIterator +_VECTOR_CLASS_TYPE::ConstIterator _VECTOR_CLASS_NAME::Find(const Value &value, const ConstIterator &start) const { int32 index = IndexOf(value, _IteratorIndex(start));