Skip to content

C
capnproto
Commit eb0d2a87 authored by Erik Murphy-Chutorian's avatar Erik Murphy-Chutorian
Browse files
Options

Avoid some MSVC workarounds for clang. Fixes capnproto/capnproto#559

parent 43fae7c5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
c++/src/kj/common.c++
View file @ eb0d2a87
...@@ -49,7 +49,7 @@ void unreachable() { ...@@ -49,7 +49,7 @@ void unreachable() {
} // namespace _ (private) } // namespace _ (private)
#if _MSC_VER #if _MSC_VER && !__clang__
float nan() { return std::numeric_limits<float>::quiet_NaN(); } float nan() { return std::numeric_limits<float>::quiet_NaN(); }
......
c++/src/kj/common.h
View file @ eb0d2a87
...@@ -166,7 +166,7 @@ typedef unsigned char byte; ...@@ -166,7 +166,7 @@ typedef unsigned char byte;
#define KJ_NOINLINE __attribute__((noinline)) #define KJ_NOINLINE __attribute__((noinline))
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER) && !__clang__
#define KJ_NORETURN(prototype) __declspec(noreturn) prototype #define KJ_NORETURN(prototype) __declspec(noreturn) prototype
#define KJ_UNUSED #define KJ_UNUSED
#define KJ_WARN_UNUSED_RESULT #define KJ_WARN_UNUSED_RESULT
...@@ -635,7 +635,7 @@ struct ThrowOverflow { ...@@ -635,7 +635,7 @@ struct ThrowOverflow {
void operator()() const; void operator()() const;
}; };
#if __GNUC__ #if __GNUC__ || __clang__
inline constexpr float inf() { return __builtin_huge_valf(); } inline constexpr float inf() { return __builtin_huge_valf(); }
inline constexpr float nan() { return __builtin_nanf(""); } inline constexpr float nan() { return __builtin_nanf(""); }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment