From a29f07a27ff26c9033cb85dffbf1da6b87db9da1 Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sat, 4 Jan 2020 16:30:48 +0100 Subject: [PATCH] atomic_queue modifications for windows builds --- src/external/atomic_queue/defs.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/external/atomic_queue/defs.h b/src/external/atomic_queue/defs.h index 7f7d3ada..0207032c 100644 --- a/src/external/atomic_queue/defs.h +++ b/src/external/atomic_queue/defs.h @@ -6,7 +6,7 @@ #include -#if defined(__x86_64__) +#if defined(__x86_64__) || defined(_M_X64) #include namespace atomic_queue { constexpr int CACHE_LINE_SIZE = 64; @@ -30,8 +30,13 @@ static inline void spin_loop_pause() noexcept { namespace atomic_queue { +#if defined(__GNUC__) #define ATOMIC_QUEUE_LIKELY(expr) __builtin_expect(static_cast(expr), 1) #define ATOMIC_QUEUE_UNLIKELY(expr) __builtin_expect(static_cast(expr), 0) +#else +#define ATOMIC_QUEUE_LIKELY(expr) expr +#define ATOMIC_QUEUE_UNLIKELY(expr) expr +#endif ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////