mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-30 01:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

__cplusplus check won't work on MSVC.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-12-08 23:13:40 +01:00
parent 0da09bc62b
commit 86c5dcced9
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/tracy_pdqsort.h
View File

@ -29,13 +29,9 @@
#include <utility> #include <utility>
#include <iterator> #include <iterator>
#if __cplusplus >= 201103L #include <cstdint>
#include <cstdint> #include <type_traits>
#include <type_traits> #define PDQSORT_PREFER_MOVE(x) std::move(x)
#define PDQSORT_PREFER_MOVE(x) std::move(x)
#else
#define PDQSORT_PREFER_MOVE(x) (x)
#endif
namespace tracy{ namespace tracy{
@ -59,11 +55,9 @@ namespace pdqsort_detail {
}; };
#if __cplusplus >= 201103L
template<class T> struct is_default_compare : std::false_type { }; template<class T> struct is_default_compare : std::false_type { };
template<class T> struct is_default_compare<std::less<T>> : std::true_type { }; template<class T> struct is_default_compare<std::less<T>> : std::true_type { };
template<class T> struct is_default_compare<std::greater<T>> : std::true_type { }; template<class T> struct is_default_compare<std::greater<T>> : std::true_type { };
#endif
// Returns floor(log2(n)), assumes n > 0. // Returns floor(log2(n)), assumes n > 0.
template<class T> template<class T>
@ -163,7 +157,7 @@ namespace pdqsort_detail {
template<class T> template<class T>
inline T* align_cacheline(T* p) { inline T* align_cacheline(T* p) {
#if defined(UINTPTR_MAX) && __cplusplus >= 201103L #if defined(UINTPTR_MAX)
std::uintptr_t ip = reinterpret_cast<std::uintptr_t>(p); std::uintptr_t ip = reinterpret_cast<std::uintptr_t>(p);
#else #else
std::size_t ip = reinterpret_cast<std::size_t>(p); std::size_t ip = reinterpret_cast<std::size_t>(p);
@ -508,16 +502,10 @@ namespace pdqsort_detail {
template<class Iter, class Compare> template<class Iter, class Compare>
inline void pdqsort(Iter begin, Iter end, Compare comp) { inline void pdqsort(Iter begin, Iter end, Compare comp) {
if (begin == end) return; if (begin == end) return;
#if __cplusplus >= 201103L
pdqsort_detail::pdqsort_loop<Iter, Compare, pdqsort_detail::pdqsort_loop<Iter, Compare,
pdqsort_detail::is_default_compare<typename std::decay<Compare>::type>::value && pdqsort_detail::is_default_compare<typename std::decay<Compare>::type>::value &&
std::is_arithmetic<typename std::iterator_traits<Iter>::value_type>::value>( std::is_arithmetic<typename std::iterator_traits<Iter>::value_type>::value>(
begin, end, comp, pdqsort_detail::log2(end - begin)); begin, end, comp, pdqsort_detail::log2(end - begin));
#else
pdqsort_detail::pdqsort_loop<Iter, Compare, false>(
begin, end, comp, pdqsort_detail::log2(end - begin));
#endif
} }
template<class Iter> template<class Iter>