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

Made the UserlandFS code gcc4 friendly.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20322 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-03-04 08:26:45 +00:00
parent 48d60fa69c
commit 6aeea78c6e
18 changed files with 56 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/userlandfs/private/Port.h
+3 -1
View File
@@ -5,6 +5,8 @@
#include <OS.h>
class KernelDebug;
namespace UserlandFSUtil {
struct PortInfo {
@@ -40,7 +42,7 @@ public:
status_t Receive(bigtime_t timeout = -1);
private:
friend class KernelDebug;
friend class ::KernelDebug;
Info fInfo;
uint8* fBuffer;
headers/private/userlandfs/private/RequestPort.h
+1 -1
View File
@@ -41,7 +41,7 @@ private:
void _PopAllocator();
private:
friend class KernelDebug;
friend class ::KernelDebug;
struct AllocatorNode;
Port fPort;
headers/private/userlandfs/shared/HashMap.h
+4 -4
View File
@@ -190,8 +190,8 @@ protected:
template<typename Key, typename Value>
class SynchronizedHashMap : public Locker {
public:
typedef HashMap<Key, Value>::Entry Entry;
typedef HashMap<Key, Value>::Iterator Iterator;
typedef typename HashMap<Key, Value>::Entry Entry;
typedef typename HashMap<Key, Value>::Iterator Iterator;
SynchronizedHashMap() : Locker("synchronized hash map") {}
~SynchronizedHashMap() { Lock(); }
@@ -420,7 +420,7 @@ HashMap<Key, Value>::Size() const
// GetIterator
template<typename Key, typename Value>
HashMap<Key, Value>::Iterator
typename HashMap<Key, Value>::Iterator
HashMap<Key, Value>::GetIterator()
{
return Iterator(this);
@@ -428,7 +428,7 @@ HashMap<Key, Value>::GetIterator()
// _FindElement
template<typename Key, typename Value>
HashMap<Key, Value>::Element *
typename HashMap<Key, Value>::Element *
HashMap<Key, Value>::_FindElement(const Key& key) const
{
Element* element = fTable.FindFirst(key.GetHashCode());
headers/private/userlandfs/shared/Vector.h
+14 -14
View File
@@ -382,7 +382,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
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Erase(int32 index)
{
if (index >= 0 && index < fItemCount) {
@@ -403,7 +403,7 @@ _VECTOR_CLASS_NAME::Erase(int32 index)
(in this case including End()).
*/
_VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Erase(const Iterator &iterator)
{
int32 index = _IteratorIndex(iterator);
@@ -458,7 +458,7 @@ _VECTOR_CLASS_NAME::MakeEmpty()
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Begin()
{
return Iterator(fItems);
@@ -474,7 +474,7 @@ _VECTOR_CLASS_NAME::Begin()
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::Begin() const
{
return ConstIterator(fItems);
@@ -490,7 +490,7 @@ _VECTOR_CLASS_NAME::Begin() const
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::End()
{
return Iterator(fItems + fItemCount);
@@ -506,7 +506,7 @@ _VECTOR_CLASS_NAME::End()
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::End() const
{
return ConstIterator(fItems + fItemCount);
@@ -522,7 +522,7 @@ _VECTOR_CLASS_NAME::End() const
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Null()
{
return Iterator(NULL);
@@ -538,7 +538,7 @@ _VECTOR_CLASS_NAME::Null()
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::Null() const
{
return ConstIterator(NULL);
@@ -551,7 +551,7 @@ _VECTOR_CLASS_NAME::Null() const
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::IteratorForIndex(int32 index)
{
if (index >= 0 && index <= fItemCount)
@@ -566,7 +566,7 @@ _VECTOR_CLASS_NAME::IteratorForIndex(int32 index)
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::IteratorForIndex(int32 index) const
{
if (index >= 0 && index <= fItemCount)
@@ -637,7 +637,7 @@ _VECTOR_CLASS_NAME::IndexOf(const Value &value, int32 start) const
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Find(const Value &value)
{
return Find(value, Begin());
@@ -654,7 +654,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value)
invalid.
*/
_VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::Iterator
typename _VECTOR_CLASS_NAME::Iterator
_VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start)
{
int32 index = IndexOf(value, _IteratorIndex(start));
@@ -672,7 +672,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value, const Iterator &start)
*/
_VECTOR_TEMPLATE_LIST
inline
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::Find(const Value &value) const
{
return Find(value, Begin());
@@ -689,7 +689,7 @@ _VECTOR_CLASS_NAME::Find(const Value &value) const
invalid.
*/
_VECTOR_TEMPLATE_LIST
_VECTOR_CLASS_NAME::ConstIterator
typename _VECTOR_CLASS_NAME::ConstIterator
_VECTOR_CLASS_NAME::Find(const Value &value, const ConstIterator &start) const
{
int32 index = IndexOf(value, _IteratorIndex(start));