From 86c5dcced9e52aecf1f9534c9d051539ce97bb97 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Fri, 8 Dec 2017 23:13:40 +0100 Subject: [PATCH] __cplusplus check won't work on MSVC. --- server/tracy_pdqsort.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/server/tracy_pdqsort.h b/server/tracy_pdqsort.h index 3d5bbb93..d927a998 100644 --- a/server/tracy_pdqsort.h +++ b/server/tracy_pdqsort.h @@ -29,13 +29,9 @@ #include #include -#if __cplusplus >= 201103L - #include - #include - #define PDQSORT_PREFER_MOVE(x) std::move(x) -#else - #define PDQSORT_PREFER_MOVE(x) (x) -#endif +#include +#include +#define PDQSORT_PREFER_MOVE(x) std::move(x) namespace tracy{ @@ -59,11 +55,9 @@ namespace pdqsort_detail { }; -#if __cplusplus >= 201103L template struct is_default_compare : std::false_type { }; template struct is_default_compare> : std::true_type { }; template struct is_default_compare> : std::true_type { }; -#endif // Returns floor(log2(n)), assumes n > 0. template @@ -163,7 +157,7 @@ namespace pdqsort_detail { template inline T* align_cacheline(T* p) { -#if defined(UINTPTR_MAX) && __cplusplus >= 201103L +#if defined(UINTPTR_MAX) std::uintptr_t ip = reinterpret_cast(p); #else std::size_t ip = reinterpret_cast(p); @@ -508,16 +502,10 @@ namespace pdqsort_detail { template inline void pdqsort(Iter begin, Iter end, Compare comp) { if (begin == end) return; - -#if __cplusplus >= 201103L pdqsort_detail::pdqsort_loop::type>::value && std::is_arithmetic::value_type>::value>( begin, end, comp, pdqsort_detail::log2(end - begin)); -#else - pdqsort_detail::pdqsort_loop( - begin, end, comp, pdqsort_detail::log2(end - begin)); -#endif } template