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

kernel: Small fixes for Clang.

Browse Source
This commit is contained in:
Augustin Cavalier
2018-06-18 19:32:13 -04:00
parent 29a21a63cb
commit 9ac3062734
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/util/kernel_cpp.h
-2
View File
@@ -22,7 +22,6 @@ extern const nothrow_t std::nothrow;
typedef struct {} mynothrow_t; typedef struct {} mynothrow_t;
extern const mynothrow_t mynothrow; extern const mynothrow_t mynothrow;
#ifndef __clang__
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
#define _THROW(x) #define _THROW(x)
#define _NOEXCEPT noexcept #define _NOEXCEPT noexcept
@@ -38,7 +37,6 @@ extern void* operator new(size_t size, const mynothrow_t &) _NOEXCEPT;
extern void* operator new[](size_t size, const mynothrow_t &) _NOEXCEPT; extern void* operator new[](size_t size, const mynothrow_t &) _NOEXCEPT;
extern void operator delete(void *ptr) _NOEXCEPT; extern void operator delete(void *ptr) _NOEXCEPT;
extern void operator delete[](void *ptr) _NOEXCEPT; extern void operator delete[](void *ptr) _NOEXCEPT;
#endif
#if __cplusplus >= 201402L #if __cplusplus >= 201402L
src/system/kernel/arch/x86/64/descriptors.cpp
+2 -2
View File
@@ -117,7 +117,7 @@ public:
unsigned ist, bool kernelOnly); unsigned ist, bool kernelOnly);
constexpr InterruptDescriptor(uintptr_t isr); constexpr InterruptDescriptor(uintptr_t isr);
static constexpr InterruptDescriptor Generate(unsigned index); static InterruptDescriptor Generate(unsigned index);
private: private:
uint16_t fBase0; uint16_t fBase0;
@@ -331,7 +331,7 @@ InterruptDescriptorTable::Load() const
} }
constexpr InterruptDescriptor InterruptDescriptor
InterruptDescriptor::Generate(unsigned index) InterruptDescriptor::Generate(unsigned index)
{ {
return index == 3 return index == 3
src/system/kernel/util/kernel_cpp.cpp
+1 -1
View File
@@ -31,7 +31,7 @@
// ... it doesn't seem to work with this symbol at least. // ... it doesn't seem to work with this symbol at least.
#ifndef USING_LIBGCC #ifndef USING_LIBGCC
# if __GNUC__ >= 6 # if __GNUC__ >= 6 || defined(__clang__)
const std::nothrow_t std::nothrow = std::nothrow_t{ }; const std::nothrow_t std::nothrow = std::nothrow_t{ };
# elif __GNUC__ >= 3 # elif __GNUC__ >= 3
const std::nothrow_t std::nothrow = {}; const std::nothrow_t std::nothrow = {};