Patch by kaliber to fix some compiling errors with clang. Removed the #include <iostream> part, but otherwise not modified.
See http://clang.llvm.org/compatibility.html#c++ why it is needed. Note that HashMap.h Key and Value are typenames as well. Afaict this is correctly done, builds and runs on gcc4. This fixes #5892. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37550 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#ifndef _FENV_H
|
||||
#define _FENV_H
|
||||
|
||||
#if defined(_X86_)
|
||||
#if defined(__INTEL__)
|
||||
# include <arch/x86/fenv.h>
|
||||
#elif defined(_x86_64_)
|
||||
# include <arch/x86_64/fenv.h>
|
||||
|
||||
@@ -143,10 +143,10 @@ private:
|
||||
previous = HashTable::_Link(previous));
|
||||
|
||||
if (previous) {
|
||||
_Link(value) = _Link(previous);
|
||||
_Link(previous) = value;
|
||||
HashTable::_Link(value) = HashTable::_Link(previous);
|
||||
HashTable::_Link(previous) = value;
|
||||
} else {
|
||||
_Link(value) = table[index];
|
||||
HashTable::_Link(value) = table[index];
|
||||
table[index] = value;
|
||||
}
|
||||
}
|
||||
@@ -165,7 +165,7 @@ private:
|
||||
for (size_t i = 0; i < HashTable::fTableSize; i++) {
|
||||
ValueType *bucket = HashTable::fTable[i];
|
||||
while (bucket) {
|
||||
ValueType *next = _Link(bucket);
|
||||
ValueType *next = HashTable::_Link(bucket);
|
||||
_Insert(newTable, newSize, bucket);
|
||||
bucket = next;
|
||||
}
|
||||
|
||||
@@ -458,7 +458,7 @@ HashMap<Key, Value>::GetIterator() const
|
||||
|
||||
// _FindElement
|
||||
template<typename Key, typename Value>
|
||||
struct HashMap<Key, Value>::Element *
|
||||
typename HashMap<Key, Value>::Element *
|
||||
HashMap<Key, Value>::_FindElement(const Key& key) const
|
||||
{
|
||||
Element* element = fTable.FindFirst(key.GetHashCode());
|
||||
|
||||
@@ -366,7 +366,7 @@ PreferencesWindow<Preferences>::PreferencesWindow(const char* title,
|
||||
template<typename Preferences>
|
||||
PreferencesWindow<Preferences>::~PreferencesWindow()
|
||||
{
|
||||
SetWindowPosition(Frame().LeftTop());
|
||||
PreferencesStorage<Preferences>::SetWindowPosition(Frame().LeftTop());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user