diff options
| author | Hans Wennborg <hans@hanshq.net> | 2017-05-10 16:25:54 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2017-05-10 16:25:54 +0000 |
| commit | f81b4d4d2139f4a2adecc7141fef89d34c51071f (patch) | |
| tree | 5ffde029f96d7e7dee4d3adc47bbfa6a66fcbf09 /lld/include/lld | |
| parent | 3b21d372c201618b1b4d6fcac46ee6cd64e09958 (diff) | |
| download | bcm5719-llvm-f81b4d4d2139f4a2adecc7141fef89d34c51071f.tar.gz bcm5719-llvm-f81b4d4d2139f4a2adecc7141fef89d34c51071f.zip | |
Fix -DLLVM_ENABLE_THREADS=OFF build of lld after r302613
llvm-svn: 302690
Diffstat (limited to 'lld/include/lld')
| -rw-r--r-- | lld/include/lld/Core/Parallel.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lld/include/lld/Core/Parallel.h b/lld/include/lld/Core/Parallel.h index a514b2ec446..20b774112ca 100644 --- a/lld/include/lld/Core/Parallel.h +++ b/lld/include/lld/Core/Parallel.h @@ -38,10 +38,10 @@ struct is_execution_policy constexpr sequential_execution_policy seq{}; constexpr parallel_execution_policy par{}; -#if LLVM_ENABLE_THREADS - namespace detail { +#if LLVM_ENABLE_THREADS + #if defined(_MSC_VER) template <class RandomAccessIterator, class Comparator> void parallel_sort(RandomAccessIterator Start, RandomAccessIterator End, @@ -148,12 +148,13 @@ void parallel_for_each_n(IndexTy Begin, IndexTy End, FuncTy Fn) { #endif +#endif + template <typename Iter> using DefComparator = std::less<typename std::iterator_traits<Iter>::value_type>; } // namespace detail -#endif // sequential algorithm implementations. template <class Policy, class RandomAccessIterator, @@ -182,7 +183,7 @@ void for_each_n(Policy policy, IndexTy Begin, IndexTy End, FuncTy Fn) { // Parallel algorithm implementations, only available when LLVM_ENABLE_THREADS // is true. -#if defined(LLVM_ENABLE_THREADS) +#if LLVM_ENABLE_THREADS template <class RandomAccessIterator, class Comparator = detail::DefComparator<RandomAccessIterator>> void sort(parallel_execution_policy policy, RandomAccessIterator Start, |
