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

This fixes all "implicit typename" warnings when compiling with GCC 3.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8024 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-17 12:51:57 +00:00
parent ede8809e4a
commit 9eed5c272c
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/VectorMap.h
+15 -14
View File
@@ -56,6 +56,7 @@ template<typename _Key, typename _Value, typename Entry, typename Parent>
#define _VECTOR_MAP_TEMPLATE_LIST template<typename Key, typename Value, \ #define _VECTOR_MAP_TEMPLATE_LIST template<typename Key, typename Value, \
typename EntryStrategy> typename EntryStrategy>
#define _VECTOR_MAP_CLASS_NAME VectorMap<Key, Value, EntryStrategy> #define _VECTOR_MAP_CLASS_NAME VectorMap<Key, Value, EntryStrategy>
#define _VECTOR_MAP_CLASS_TYPE typename VectorMap<Key, Value, EntryStrategy>
/*! /*!
\class VectorMap \class VectorMap
@@ -84,10 +85,10 @@ public:
Entry; Entry;
typedef VectorMapEntry<KeyReference, const Value, const _Entry, typedef VectorMapEntry<KeyReference, const Value, const _Entry,
const Class> ConstEntry; const Class> ConstEntry;
typedef VectorMapIterator<Entry, Class, ElementVector::Iterator> typedef VectorMapIterator<Entry, Class, typename ElementVector::Iterator>
Iterator; Iterator;
typedef VectorMapIterator<ConstEntry, const Class, typedef VectorMapIterator<ConstEntry, const Class, typename ElementVector::ConstIterator>
ElementVector::ConstIterator> ConstIterator; ConstIterator;
private: private:
static const size_t kDefaultChunkSize = 10; static const size_t kDefaultChunkSize = 10;
@@ -406,7 +407,7 @@ _VECTOR_MAP_CLASS_NAME::Remove(const Key &key)
(in this case including End()). (in this case including End()).
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::Erase(const Iterator &iterator) _VECTOR_MAP_CLASS_NAME::Erase(const Iterator &iterator)
{ {
return Iterator(this, fElements.Erase(iterator.GetIterator())); return Iterator(this, fElements.Erase(iterator.GetIterator()));
@@ -456,7 +457,7 @@ _VECTOR_MAP_CLASS_NAME::MakeEmpty()
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::Begin() _VECTOR_MAP_CLASS_NAME::Begin()
{ {
return Iterator(this, fElements.Begin()); return Iterator(this, fElements.Begin());
@@ -472,7 +473,7 @@ _VECTOR_MAP_CLASS_NAME::Begin()
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::ConstIterator _VECTOR_MAP_CLASS_TYPE::ConstIterator
_VECTOR_MAP_CLASS_NAME::Begin() const _VECTOR_MAP_CLASS_NAME::Begin() const
{ {
return ConstIterator(this, fElements.Begin()); return ConstIterator(this, fElements.Begin());
@@ -488,7 +489,7 @@ _VECTOR_MAP_CLASS_NAME::Begin() const
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::End() _VECTOR_MAP_CLASS_NAME::End()
{ {
return Iterator(this, fElements.End()); return Iterator(this, fElements.End());
@@ -504,7 +505,7 @@ _VECTOR_MAP_CLASS_NAME::End()
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::ConstIterator _VECTOR_MAP_CLASS_TYPE::ConstIterator
_VECTOR_MAP_CLASS_NAME::End() const _VECTOR_MAP_CLASS_NAME::End() const
{ {
return ConstIterator(this, fElements.End()); return ConstIterator(this, fElements.End());
@@ -520,7 +521,7 @@ _VECTOR_MAP_CLASS_NAME::End() const
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::Null() _VECTOR_MAP_CLASS_NAME::Null()
{ {
return Iterator(this, fElements.Null()); return Iterator(this, fElements.Null());
@@ -536,7 +537,7 @@ _VECTOR_MAP_CLASS_NAME::Null()
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
inline inline
_VECTOR_MAP_CLASS_NAME::ConstIterator _VECTOR_MAP_CLASS_TYPE::ConstIterator
_VECTOR_MAP_CLASS_NAME::Null() const _VECTOR_MAP_CLASS_NAME::Null() const
{ {
return ConstIterator(this, fElements.Null()); return ConstIterator(this, fElements.Null());
@@ -550,7 +551,7 @@ _VECTOR_MAP_CLASS_NAME::Null() const
map doesn't contain any entry with the given value. map doesn't contain any entry with the given value.
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::Find(const Key &key) _VECTOR_MAP_CLASS_NAME::Find(const Key &key)
{ {
bool exists = false; bool exists = false;
@@ -568,7 +569,7 @@ _VECTOR_MAP_CLASS_NAME::Find(const Key &key)
map doesn't contain any entry with the given value. map doesn't contain any entry with the given value.
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
_VECTOR_MAP_CLASS_NAME::ConstIterator _VECTOR_MAP_CLASS_TYPE::ConstIterator
_VECTOR_MAP_CLASS_NAME::Find(const Key &key) const _VECTOR_MAP_CLASS_NAME::Find(const Key &key) const
{ {
bool exists = false; bool exists = false;
@@ -602,7 +603,7 @@ _VECTOR_MAP_CLASS_NAME::Find(const Key &key) const
one according to \a less. one according to \a less.
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
_VECTOR_MAP_CLASS_NAME::Iterator _VECTOR_MAP_CLASS_TYPE::Iterator
_VECTOR_MAP_CLASS_NAME::FindClose(const Key &key, bool less) _VECTOR_MAP_CLASS_NAME::FindClose(const Key &key, bool less)
{ {
bool exists = false; bool exists = false;
@@ -643,7 +644,7 @@ _VECTOR_MAP_CLASS_NAME::FindClose(const Key &key, bool less)
one according to \a less. one according to \a less.
*/ */
_VECTOR_MAP_TEMPLATE_LIST _VECTOR_MAP_TEMPLATE_LIST
_VECTOR_MAP_CLASS_NAME::ConstIterator _VECTOR_MAP_CLASS_TYPE::ConstIterator
_VECTOR_MAP_CLASS_NAME::FindClose(const Key &key, bool less) const _VECTOR_MAP_CLASS_NAME::FindClose(const Key &key, bool less) const
{ {
bool exists = false; bool exists = false;
headers/private/kernel/util/VectorSet.h
+12 -11
View File
@@ -46,6 +46,7 @@ namespace VectorSetOrder {
#define _VECTOR_SET_TEMPLATE_LIST template<typename Value, \ #define _VECTOR_SET_TEMPLATE_LIST template<typename Value, \
typename ElementOrder> typename ElementOrder>
#define _VECTOR_SET_CLASS_NAME VectorSet<Value, ElementOrder> #define _VECTOR_SET_CLASS_NAME VectorSet<Value, ElementOrder>
#define _VECTOR_SET_CLASS_TYPE typename VectorSet<Value, ElementOrder>
/*! /*!
\class VectorSet \class VectorSet
@@ -186,7 +187,7 @@ _VECTOR_SET_CLASS_NAME::Remove(const Value &value)
(in this case including End()). (in this case including End()).
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::Erase(const Iterator &iterator) _VECTOR_SET_CLASS_NAME::Erase(const Iterator &iterator)
{ {
return fElements.Erase(iterator); return fElements.Erase(iterator);
@@ -236,7 +237,7 @@ _VECTOR_SET_CLASS_NAME::MakeEmpty()
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::Begin() _VECTOR_SET_CLASS_NAME::Begin()
{ {
return fElements.Begin(); return fElements.Begin();
@@ -252,7 +253,7 @@ _VECTOR_SET_CLASS_NAME::Begin()
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::ConstIterator _VECTOR_SET_CLASS_TYPE::ConstIterator
_VECTOR_SET_CLASS_NAME::Begin() const _VECTOR_SET_CLASS_NAME::Begin() const
{ {
return fElements.Begin(); return fElements.Begin();
@@ -268,7 +269,7 @@ _VECTOR_SET_CLASS_NAME::Begin() const
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::End() _VECTOR_SET_CLASS_NAME::End()
{ {
return fElements.End(); return fElements.End();
@@ -284,7 +285,7 @@ _VECTOR_SET_CLASS_NAME::End()
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::ConstIterator _VECTOR_SET_CLASS_TYPE::ConstIterator
_VECTOR_SET_CLASS_NAME::End() const _VECTOR_SET_CLASS_NAME::End() const
{ {
return fElements.End(); return fElements.End();
@@ -300,7 +301,7 @@ _VECTOR_SET_CLASS_NAME::End() const
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::Null() _VECTOR_SET_CLASS_NAME::Null()
{ {
return fElements.Null(); return fElements.Null();
@@ -316,7 +317,7 @@ _VECTOR_SET_CLASS_NAME::Null()
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
inline inline
_VECTOR_SET_CLASS_NAME::ConstIterator _VECTOR_SET_CLASS_TYPE::ConstIterator
_VECTOR_SET_CLASS_NAME::Null() const _VECTOR_SET_CLASS_NAME::Null() const
{ {
return fElements.Null(); return fElements.Null();
@@ -330,7 +331,7 @@ _VECTOR_SET_CLASS_NAME::Null() const
set doesn't contain any element with the given value. set doesn't contain any element with the given value.
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::Find(const Value &value) _VECTOR_SET_CLASS_NAME::Find(const Value &value)
{ {
bool exists = false; bool exists = false;
@@ -348,7 +349,7 @@ _VECTOR_SET_CLASS_NAME::Find(const Value &value)
set doesn't contain any element with the given value. set doesn't contain any element with the given value.
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
_VECTOR_SET_CLASS_NAME::ConstIterator _VECTOR_SET_CLASS_TYPE::ConstIterator
_VECTOR_SET_CLASS_NAME::Find(const Value &value) const _VECTOR_SET_CLASS_NAME::Find(const Value &value) const
{ {
bool exists = false; bool exists = false;
@@ -382,7 +383,7 @@ _VECTOR_SET_CLASS_NAME::Find(const Value &value) const
one according to \a less. one according to \a less.
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
_VECTOR_SET_CLASS_NAME::Iterator _VECTOR_SET_CLASS_TYPE::Iterator
_VECTOR_SET_CLASS_NAME::FindClose(const Value &value, bool less) _VECTOR_SET_CLASS_NAME::FindClose(const Value &value, bool less)
{ {
bool exists = false; bool exists = false;
@@ -423,7 +424,7 @@ _VECTOR_SET_CLASS_NAME::FindClose(const Value &value, bool less)
one according to \a less. one according to \a less.
*/ */
_VECTOR_SET_TEMPLATE_LIST _VECTOR_SET_TEMPLATE_LIST
_VECTOR_SET_CLASS_NAME::ConstIterator _VECTOR_SET_CLASS_TYPE::ConstIterator
_VECTOR_SET_CLASS_NAME::FindClose(const Value &value, bool less) const _VECTOR_SET_CLASS_NAME::FindClose(const Value &value, bool less) const
{ {
bool exists = false; bool exists = false;