Ticket #5892: haiku-clang-build-fixes-updated.patch

src/preferences/cpufrequency/PreferencesWindow.h

@@ -362 +362 @@
 template<typename Preferences>
 PreferencesWindow<Preferences>::~PreferencesWindow()
 {
-    SetWindowPosition(Frame().LeftTop());
+    PreferencesStorage<Preferences>::SetWindowPosition(Frame().LeftTop());
 }
 
 

src/libs/print/libprint/PackBits.cpp

@@ -14 +14 @@
 #include "PackBits.h"
 
 #if (!__MWERKS__ || defined(MSIPL_USING_NAMESPACE))
+#include <iostream>
 using namespace std;
 #else 
 #define std

headers/posix/fenv.h

@@ -1 +1 @@
 #ifndef _FENV_H
 #define _FENV_H
 
-#if defined(_X86_)
+#if defined(__INTEL__)
 #  include <arch/x86/fenv.h>
 #elif defined(__ARM__)
 #  include <arch/arm/fenv.h>

headers/posix/math.h

@@ -29 +29 @@
 
 #define __HUGE_VALF_v   0x7f800000L
 #define __huge_valf_t   union { unsigned char __c[4]; long __l; float __f; }
+#ifdef __clang__
+static __huge_valf_t __huge_valf = { {__HUGE_VALF_v} };
+#define HUGE_VALF       (__huge_valf.__f)
+#else
 #define HUGE_VALF       (((__huge_valf_t) { __l: __HUGE_VALF_v }).__f)
+#endif
 
 /* TODO: define HUGE_VALL for long doubles */
 

headers/private/kernel/util/MultiHashTable.h

@@ -143 +143 @@
                 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 +165 @@
             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;
                 }

headers/private/shared/HashMap.h

@@ -458 +458 @@
 
 // _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());