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

Patch by kaliber to fix some compiling errors with clang. Removed the #include <iostream> part, but otherwise not modified.

Browse Source 
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:
Fredrik Holmqvist
2010-07-17 10:33:24 +00:00
parent e5ea208d71
commit a636d1e365
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/posix/fenv.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _FENV_H #ifndef _FENV_H
#define _FENV_H #define _FENV_H
#if defined(_X86_) #if defined(__INTEL__)
# include <arch/x86/fenv.h> # include <arch/x86/fenv.h>
#elif defined(_x86_64_) #elif defined(_x86_64_)
# include <arch/x86_64/fenv.h> # include <arch/x86_64/fenv.h>
headers/private/kernel/util/MultiHashTable.h
+4 -4
View File
@@ -143,10 +143,10 @@ private:
previous = HashTable::_Link(previous)); previous = HashTable::_Link(previous));
if (previous) { if (previous) {
_Link(value) = _Link(previous); HashTable::_Link(value) = HashTable::_Link(previous);
_Link(previous) = value; HashTable::_Link(previous) = value;
} else { } else {
_Link(value) = table[index]; HashTable::_Link(value) = table[index];
table[index] = value; table[index] = value;
} }
} }
@@ -165,7 +165,7 @@ private:
for (size_t i = 0; i < HashTable::fTableSize; i++) { for (size_t i = 0; i < HashTable::fTableSize; i++) {
ValueType *bucket = HashTable::fTable[i]; ValueType *bucket = HashTable::fTable[i];
while (bucket) { while (bucket) {
ValueType *next = _Link(bucket); ValueType *next = HashTable::_Link(bucket);
_Insert(newTable, newSize, bucket); _Insert(newTable, newSize, bucket);
bucket = next; bucket = next;
} }
headers/private/shared/HashMap.h
+1 -1
View File
@@ -458,7 +458,7 @@ HashMap<Key, Value>::GetIterator() const
// _FindElement // _FindElement
template<typename Key, typename Value> template<typename Key, typename Value>
struct HashMap<Key, Value>::Element * typename HashMap<Key, Value>::Element *
HashMap<Key, Value>::_FindElement(const Key& key) const HashMap<Key, Value>::_FindElement(const Key& key) const
{ {
Element* element = fTable.FindFirst(key.GetHashCode()); Element* element = fTable.FindFirst(key.GetHashCode());
src/preferences/cpufrequency/PreferencesWindow.h
+1 -1
View File
@@ -366,7 +366,7 @@ PreferencesWindow<Preferences>::PreferencesWindow(const char* title,
template<typename Preferences> template<typename Preferences>
PreferencesWindow<Preferences>::~PreferencesWindow() PreferencesWindow<Preferences>::~PreferencesWindow()
{ {
SetWindowPosition(Frame().LeftTop()); PreferencesStorage<Preferences>::SetWindowPosition(Frame().LeftTop());
} }