From d71d76414b8cc6a3d5658ceed57e540687d1c23e Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 15 Apr 2021 19:55:50 +0200 Subject: [PATCH] Allow setting NO_PARALLEL_SORT externally. --- server/TracySort.hpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/server/TracySort.hpp b/server/TracySort.hpp index 2a1b54a0..3f47180e 100644 --- a/server/TracySort.hpp +++ b/server/TracySort.hpp @@ -1,15 +1,17 @@ #ifndef __TRACYSORT_HPP__ #define __TRACYSORT_HPP__ -#if !defined __APPLE__ && ( ( defined _MSC_VER && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) -# if __has_include() -# include -# include +#ifndef NO_PARALLEL_SORT +# if !defined __APPLE__ && ( ( defined _MSC_VER && _MSVC_LANG >= 201703L ) || __cplusplus >= 201703L ) +# if __has_include() +# include +# include +# else +# define NO_PARALLEL_SORT +# endif # else # define NO_PARALLEL_SORT # endif -#else -# define NO_PARALLEL_SORT #endif #include "tracy_pdqsort.h"