i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This fixes several "implicit typename" warnings with GCC 3.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8023 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-17 12:37:40 +00:00
parent 3ae898da8b
commit ede8809e4a
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/Vector.h
+15 -14
View File
@@ -39,6 +39,7 @@ template<typename Value> class VectorIterator;
// for convenience // for convenience
#define _VECTOR_TEMPLATE_LIST template<typename Value> #define _VECTOR_TEMPLATE_LIST template<typename Value>
#define _VECTOR_CLASS_NAME Vector<Value> #define _VECTOR_CLASS_NAME Vector<Value>
#define _VECTOR_CLASS_TYPE typename Vector<Value>
/*! /*!
\class Vector \class Vector
@@ -382,7 +383,7 @@ _VECTOR_CLASS_NAME::Remove(const Value &value)
removed), or Null(), if \a index was out of range. removed), or Null(), if \a index was out of range.
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Erase(int32 index) _VECTOR_CLASS_NAME::Erase(int32 index)
{ {
if (index >= 0 && index < fItemCount) { if (index >= 0 && index < fItemCount) {
@@ -403,7 +404,7 @@ _VECTOR_CLASS_NAME::Erase(int32 index)
(in this case including End()). (in this case including End()).
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Erase(const Iterator &iterator) _VECTOR_CLASS_NAME::Erase(const Iterator &iterator)
{ {
int32 index = _IteratorIndex(iterator); int32 index = _IteratorIndex(iterator);
@@ -458,7 +459,7 @@ _VECTOR_CLASS_NAME::MakeEmpty()
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Begin() _VECTOR_CLASS_NAME::Begin()
{ {
return Iterator(fItems); return Iterator(fItems);
@@ -474,7 +475,7 @@ _VECTOR_CLASS_NAME::Begin()
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::Begin() const _VECTOR_CLASS_NAME::Begin() const
{ {
return ConstIterator(fItems); return ConstIterator(fItems);
@@ -490,7 +491,7 @@ _VECTOR_CLASS_NAME::Begin() const
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::End() _VECTOR_CLASS_NAME::End()
{ {
return Iterator(fItems + fItemCount); return Iterator(fItems + fItemCount);
@@ -506,7 +507,7 @@ _VECTOR_CLASS_NAME::End()
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::End() const _VECTOR_CLASS_NAME::End() const
{ {
return ConstIterator(fItems + fItemCount); return ConstIterator(fItems + fItemCount);
@@ -522,7 +523,7 @@ _VECTOR_CLASS_NAME::End() const
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Null() _VECTOR_CLASS_NAME::Null()
{ {
return Iterator(NULL); return Iterator(NULL);
@@ -538,7 +539,7 @@ _VECTOR_CLASS_NAME::Null()
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::Null() const _VECTOR_CLASS_NAME::Null() const
{ {
return ConstIterator(NULL); return ConstIterator(NULL);
@@ -551,7 +552,7 @@ _VECTOR_CLASS_NAME::Null() const
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::IteratorForIndex(int32 index) _VECTOR_CLASS_NAME::IteratorForIndex(int32 index)
{ {
if (index >= 0 && index <= fItemCount) if (index >= 0 && index <= fItemCount)
@@ -566,7 +567,7 @@ _VECTOR_CLASS_NAME::IteratorForIndex(int32 index)
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::IteratorForIndex(int32 index) const _VECTOR_CLASS_NAME::IteratorForIndex(int32 index) const
{ {
if (index >= 0 && index <= fItemCount) if (index >= 0 && index <= fItemCount)
@@ -637,7 +638,7 @@ _VECTOR_CLASS_NAME::IndexOf(const Value &value, int32 start) const
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Find(const Value &value) _VECTOR_CLASS_NAME::Find(const Value &value)
{ {
return Find(value, Begin()); return Find(value, Begin());
@@ -654,7 +655,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value)
invalid. invalid.
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::Iterator _VECTOR_CLASS_TYPE::Iterator
_VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start) _VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start)
{ {
int32 index = IndexOf(value, _IteratorIndex(start)); int32 index = IndexOf(value, _IteratorIndex(start));
@@ -672,7 +673,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start)
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
inline inline
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::Find(const Value &value) const _VECTOR_CLASS_NAME::Find(const Value &value) const
{ {
return Find(value, Begin()); return Find(value, Begin());
@@ -689,7 +690,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value) const
invalid. invalid.
*/ */
_VECTOR_TEMPLATE_LIST _VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::ConstIterator _VECTOR_CLASS_TYPE::ConstIterator
_VECTOR_CLASS_NAME::Find(const Value &value, const ConstIterator &start) const _VECTOR_CLASS_NAME::Find(const Value &value, const ConstIterator &start) const
{ {
int32 index = IndexOf(value, _IteratorIndex(start)); int32 index = IndexOf(value, _IteratorIndex(start));