Index: include/pstl/internal/algorithm_fwd.h =================================================================== --- include/pstl/internal/algorithm_fwd.h +++ include/pstl/internal/algorithm_fwd.h @@ -15,7 +15,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -44,12 +44,6 @@ /*parallel=*/std::true_type); #endif -#if 0 - // TODO does this even need forwarding? -template -_ForwardIterator for_each_n_it_serial(_ForwardIterator, _Size, _Function); -#endif - //------------------------------------------------------------------------ // walk1 (pseudo) // @@ -1337,6 +1331,6 @@ _ForwardIterator2, _Compare, _IsVector, /* is_parallel = */ std::true_type) noexcept; #endif -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_algorithm_fwd_H */ Index: include/pstl/internal/algorithm_impl.h =================================================================== --- include/pstl/internal/algorithm_impl.h +++ include/pstl/internal/algorithm_impl.h @@ -27,7 +27,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -55,7 +55,7 @@ __pattern_any_of(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred, _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_any_of(__first, __last, __pred, __is_vector); + return __brick_any_of(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -64,11 +64,11 @@ __pattern_any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred, _IsVector __is_vector, /*parallel=*/std::true_type) { - return internal::__except_handler([&]() { - return internal::__parallel_or(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) { - return internal::__brick_any_of(__i, __j, __pred, __is_vector); - }); + return __except_handler([&]() { + return __parallel_or(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) { + return __brick_any_of(__i, __j, __pred, __is_vector); + }); }); } #endif @@ -78,7 +78,7 @@ template _ForwardIterator -for_each_n_it_serial(_ForwardIterator __first, _Size __n, _Function __f) +__for_each_n_it_serial(_ForwardIterator __first, _Size __n, _Function __f) { for (; __n > 0; ++__first, --__n) __f(__first); @@ -111,7 +111,7 @@ _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - internal::__brick_walk1(__first, __last, __f, __is_vector); + __brick_walk1(__first, __last, __f, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -121,10 +121,10 @@ _IsVector __is_vector, /*parallel=*/std::true_type) { - internal::__except_handler([&]() { + __except_handler([&]() { __par_backend::__parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last, [__f, __is_vector](_ForwardIterator __i, _ForwardIterator __j) { - internal::__brick_walk1(__i, __j, __f, __is_vector); + __brick_walk1(__i, __j, __f, __is_vector); }); }); } @@ -144,7 +144,7 @@ __pattern_walk_brick(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Brick __brick, /*parallel=*/std::true_type) { - internal::__except_handler([&]() { + __except_handler([&]() { __par_backend::__parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last, [__brick](_ForwardIterator __i, _ForwardIterator __j) { __brick(__i, __j); }); }); @@ -158,7 +158,8 @@ _ForwardIterator __brick_walk1_n(_ForwardIterator __first, _Size __n, _Function __f, /*_IsVectorTag=*/std::false_type) { - return for_each_n_it_serial(__first, __n, [&__f](_ForwardIterator __it) { __f(*__it); }); // calling serial version + return __for_each_n_it_serial(__first, __n, + [&__f](_ForwardIterator __it) { __f(*__it); }); // calling serial version } template @@ -174,7 +175,7 @@ __pattern_walk1_n(_ExecutionPolicy&&, _ForwardIterator __first, _Size __n, _Function __f, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_walk1_n(__first, __n, __f, __is_vector); + return __brick_walk1_n(__first, __n, __f, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -184,8 +185,7 @@ _IsVector __is_vector, /*is_parallel=*/std::true_type) { - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __first + __n, __f, __is_vector, - std::true_type()); + __pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __first + __n, __f, __is_vector, std::true_type()); return __first + __n; } #endif @@ -204,7 +204,7 @@ __pattern_walk_brick_n(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _Size __n, _Brick __brick, /*is_parallel=*/std::true_type) { - return internal::__except_handler([&]() { + return __except_handler([&]() { __par_backend::__parallel_for( std::forward<_ExecutionPolicy>(__exec), __first, __first + __n, [__brick](_RandomAccessIterator __i, _RandomAccessIterator __j) { __brick(__i, __j - __i); }); @@ -259,7 +259,7 @@ __pattern_walk2(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Function __f, _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_walk2(__first1, __last1, __first2, __f, __is_vector); + return __brick_walk2(__first1, __last1, __first2, __f, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -268,11 +268,11 @@ __pattern_walk2(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Function __f, _IsVector __is_vector, /*parallel=*/std::true_type) { - return internal::__except_handler([&]() { + return __except_handler([&]() { __par_backend::__parallel_for( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, [__f, __first1, __first2, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) { - internal::__brick_walk2(__i, __j, __first2 + (__i - __first1), __f, __is_vector); + __brick_walk2(__i, __j, __first2 + (__i - __first1), __f, __is_vector); }); return __first2 + (__last1 - __first1); }); @@ -285,7 +285,7 @@ __pattern_walk2_n(_ExecutionPolicy&&, _ForwardIterator1 __first1, _Size n, _ForwardIterator2 __first2, _Function f, _IsVector is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_walk2_n(__first1, n, __first2, f, is_vector); + return __brick_walk2_n(__first1, n, __first2, f, is_vector); } template (__exec), __first1, __first1 + n, __first2, f, - is_vector, std::true_type()); + return __pattern_walk2(std::forward<_ExecutionPolicy>(__exec), __first1, __first1 + n, __first2, f, is_vector, + std::true_type()); } template @@ -377,7 +377,7 @@ __pattern_walk3(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator3 __first3, _Function __f, _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_walk3(__first1, __last1, __first2, __first3, __f, __is_vector); + return __brick_walk3(__first1, __last1, __first2, __first3, __f, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -388,12 +388,11 @@ _RandomAccessIterator2 __first2, _RandomAccessIterator3 __first3, _Function __f, _IsVector __is_vector, /*parallel=*/std::true_type) { - return internal::__except_handler([&]() { + return __except_handler([&]() { __par_backend::__parallel_for( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, [__f, __first1, __first2, __first3, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) { - internal::__brick_walk3(__i, __j, __first2 + (__i - __first1), __first3 + (__i - __first1), __f, - __is_vector); + __brick_walk3(__i, __j, __first2 + (__i - __first1), __first3 + (__i - __first1), __f, __is_vector); }); return __first3 + (__last1 - __first1); }); @@ -427,7 +426,7 @@ __pattern_equal(_ExecutionPolicy&&, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __p, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_equal(__first1, __last1, __first2, __p, __is_vector); + return __brick_equal(__first1, __last1, __first2, __p, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -438,8 +437,8 @@ _RandomAccessIterator2 __first2, _BinaryPredicate __p, _IsVector __is_vector, /*is_parallel=*/std::true_type) { - return internal::__except_handler([&]() { - return !internal::__parallel_or( + return __except_handler([&]() { + return !__parallel_or( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, [__first1, __first2, __p, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) { return !__brick_equal(__i, __j, __first2 + (__i - __first1), __p, __is_vector); @@ -476,7 +475,7 @@ _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_find_if(__first, __last, __pred, __is_vector); + return __brick_find_if(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -486,13 +485,13 @@ _IsVector __is_vector, /*is_parallel=*/std::true_type) { - return internal::__except_handler([&]() { - return internal::__parallel_find(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) { - return internal::__brick_find_if(__i, __j, __pred, __is_vector); - }, - std::less::difference_type>(), - /*is_first=*/true); + return __except_handler([&]() { + return __parallel_find(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [__pred, __is_vector](_ForwardIterator __i, _ForwardIterator __j) { + return __brick_find_if(__i, __j, __pred, __is_vector); + }, + std::less::difference_type>(), + /*is_first=*/true); }); } #endif @@ -506,9 +505,9 @@ // b_first determines what occurrence we want to find (first or last) template _RandomAccessIterator1 -find_subrange(_RandomAccessIterator1 __first, _RandomAccessIterator1 __last, _RandomAccessIterator1 __global_last, - _RandomAccessIterator2 __s_first, _RandomAccessIterator2 __s_last, _BinaryPredicate __pred, - bool __b_first, _IsVector __is_vector) noexcept +__find_subrange(_RandomAccessIterator1 __first, _RandomAccessIterator1 __last, _RandomAccessIterator1 __global_last, + _RandomAccessIterator2 __s_first, _RandomAccessIterator2 __s_last, _BinaryPredicate __pred, + bool __b_first, _IsVector __is_vector) noexcept { typedef typename std::iterator_traits<_RandomAccessIterator2>::value_type _ValueType; auto __n2 = __s_last - __s_first; @@ -527,15 +526,14 @@ while (__first != __last && (__global_last - __first >= __n2)) { // find position of *s_first in [first, last) (it can be start of subsequence) - __first = internal::__brick_find_if( - __first, __last, internal::__equal_value_by_pred<_ValueType, _BinaryPredicate>(*__s_first, __pred), - __is_vector); + __first = __brick_find_if(__first, __last, + __equal_value_by_pred<_ValueType, _BinaryPredicate>(*__s_first, __pred), __is_vector); // if position that was found previously is the start of subsequence // then we can exit the loop (b_first == true) or keep the position // (b_first == false) if (__first != __last && (__global_last - __first >= __n2) && - internal::__brick_equal(__s_first + 1, __s_last, __first + 1, __pred, __is_vector)) + __brick_equal(__s_first + 1, __s_last, __first + 1, __pred, __is_vector)) { if (__b_first) { @@ -563,8 +561,8 @@ template _RandomAccessIterator -find_subrange(_RandomAccessIterator __first, _RandomAccessIterator __last, _RandomAccessIterator __global_last, - _Size __count, const _Tp& __value, _BinaryPredicate __pred, _IsVector __is_vector) noexcept +__find_subrange(_RandomAccessIterator __first, _RandomAccessIterator __last, _RandomAccessIterator __global_last, + _Size __count, const _Tp& __value, _BinaryPredicate __pred, _IsVector __is_vector) noexcept { if (__global_last - __first < __count || __count < 1) { @@ -572,15 +570,15 @@ } auto __n = __global_last - __first; - auto __unary_pred = internal::__equal_value_by_pred<_Tp, _BinaryPredicate>(__value, __pred); + auto __unary_pred = __equal_value_by_pred<_Tp, _BinaryPredicate>(__value, __pred); while (__first != __last && (__global_last - __first >= __count)) { __first = __brick_find_if(__first, __last, __unary_pred, __is_vector); // check that all of elements in [first+1, first+count) equal to value if (__first != __last && (__global_last - __first >= __count) && - !internal::__brick_any_of(__first + 1, __first + __count, - internal::__not_pred(__unary_pred), __is_vector)) + !__brick_any_of(__first + 1, __first + __count, __not_pred(__unary_pred), + __is_vector)) { return __first; } @@ -609,7 +607,7 @@ __brick_find_end(_ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred, /*__is_vector=*/std::true_type) noexcept { - return internal::find_subrange(__first, __last, __last, __s_first, __s_last, __pred, false, std::true_type()); + return __find_subrange(__first, __last, __last, __s_first, __s_last, __pred, false, std::true_type()); } template (__exec), __first, __last, __s_first, - __pred, __is_vector, std::true_type()); + const bool __res = __pattern_equal(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __pred, + __is_vector, std::true_type()); return __res ? __first : __last; } else { return __except_handler([&]() { - return internal::__parallel_find( + return __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, [__last, __s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) { - return internal::find_subrange(__i, __j, __last, __s_first, __s_last, __pred, false, __is_vector); + return __find_subrange(__i, __j, __last, __s_first, __s_last, __pred, false, __is_vector); }, std::greater::difference_type>(), /*is_first=*/false); }); @@ -676,7 +674,7 @@ _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_find_first_of(__first, __last, __s_first, __s_last, __pred, __is_vector); + return __brick_find_first_of(__first, __last, __s_first, __s_last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -688,10 +686,10 @@ _IsVector __is_vector, /*is_parallel=*/std::true_type) noexcept { return __except_handler([&]() { - return internal::__parallel_find( + return __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, [__s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) { - return internal::__brick_find_first_of(__i, __j, __s_first, __s_last, __pred, __is_vector); + return __brick_find_first_of(__i, __j, __s_first, __s_last, __pred, __is_vector); }, std::less::difference_type>(), /*is_first=*/true); }); @@ -714,7 +712,7 @@ __brick_search(_ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred, /*vector=*/std::true_type) noexcept { - return internal::find_subrange(__first, __last, __last, __s_first, __s_last, __pred, true, std::true_type()); + return __find_subrange(__first, __last, __last, __s_first, __s_last, __pred, true, std::true_type()); } template (__exec), __first, __last, __s_first, - __pred, __is_vector, std::true_type()); + const bool __res = __pattern_equal(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __pred, + __is_vector, std::true_type()); return __res ? __first : __last; } else { return __except_handler([&]() { - return internal::__parallel_find( + return __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, [__last, __s_first, __s_last, __pred, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) { - return internal::find_subrange(__i, __j, __last, __s_first, __s_last, __pred, true, __is_vector); + return __find_subrange(__i, __j, __last, __s_first, __s_last, __pred, true, __is_vector); }, std::less::difference_type>(), /*is_first=*/true); }); @@ -772,7 +770,7 @@ __brick_search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value, _BinaryPredicate __pred, /*vector=*/std::true_type) noexcept { - return internal::find_subrange(__first, __last, __last, __count, __value, __pred, std::true_type()); + return __find_subrange(__first, __last, __last, __count, __value, __pred, std::true_type()); } template (__exec), __first, __last, - [&__value, &__pred](const _Tp& __val) { return !__pred(__val, __value); }, - __is_vector, /*is_parallel*/ std::true_type()); + !__pattern_any_of(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [&__value, &__pred](const _Tp& __val) { return !__pred(__val, __value); }, __is_vector, + /*is_parallel*/ std::true_type()); return __result ? __first : __last; } else { return __except_handler([&__exec, __first, __last, __count, &__value, __pred, __is_vector]() { - return internal::__parallel_find( + return __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, [__last, __count, &__value, __pred, __is_vector](_RandomAccessIterator __i, _RandomAccessIterator __j) { - return internal::find_subrange(__i, __j, __last, __count, __value, __pred, __is_vector); + return __find_subrange(__i, __j, __last, __count, __value, __pred, __is_vector); }, std::less::difference_type>(), /*is_first=*/true); }); @@ -929,7 +927,7 @@ auto __count_true = _DifferenceType(0); auto __size = __last - __first; - static_assert(internal::__is_random_access_iterator<_ForwardIterator>::value, + static_assert(__is_random_access_iterator<_ForwardIterator>::value, "Pattern-brick error. Should be a random access iterator."); for (; __first != __last; ++__first, ++__mask) @@ -975,7 +973,7 @@ #if (__PSTL_MONOTONIC_PRESENT) unseq_backend::simd_copy_by_mask(__first, __last - __first, __result, __mask, __assigner); #else - internal::__brick_copy_by_mask(__first, __last, __result, __mask, __assigner, std::false_type()); + __brick_copy_by_mask(__first, __last, __result, __mask, __assigner, std::false_type()); #endif } @@ -1007,7 +1005,7 @@ #if (__PSTL_MONOTONIC_PRESENT) unseq_backend::simd_partition_by_mask(__first, __last - __first, __out_true, __out_false, __mask); #else - internal::__brick_partition_by_mask(__first, __last, __out_true, __out_false, __mask, std::false_type()); + __brick_partition_by_mask(__first, __last, __out_true, __out_false, __mask, std::false_type()); #endif } @@ -1016,7 +1014,7 @@ __pattern_copy_if(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _UnaryPredicate __pred, _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_copy_if(__first, __last, __result, __pred, __is_vector); + return __brick_copy_if(__first, __last, __result, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1127,7 +1125,7 @@ __pattern_unique(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_unique(__first, __last, __pred, __is_vector); + return __brick_unique(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1267,7 +1265,7 @@ __pattern_unique_copy(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, _BinaryPredicate __pred, _IsVector __is_vector, /*parallel=*/std::false_type) noexcept { - return internal::__brick_unique_copy(__first, __last, __result, __pred, __is_vector); + return __brick_unique_copy(__first, __last, __result, __pred, __is_vector); } template @@ -1307,7 +1305,7 @@ __par_backend::__buffer __mask_buf(__n); if (_DifferenceType(2) < __n) { - return internal::__except_handler([&__exec, __n, __first, __result, __pred, __is_vector, &__mask_buf]() { + return __except_handler([&__exec, __n, __first, __result, __pred, __is_vector, &__mask_buf]() { bool* __mask = __mask_buf.get(); _DifferenceType __m{}; __par_backend::parallel_strict_scan( @@ -1330,9 +1328,9 @@ std::plus<_DifferenceType>(), // Combine [=](_DifferenceType __i, _DifferenceType __len, _DifferenceType __initial) { // Scan // Phase 2 is same as for __pattern_copy_if - internal::__brick_copy_by_mask( - __first + __i, __first + (__i + __len), __result + __initial, __mask + __i, - [](_RandomAccessIterator __x, _OutputIterator __z) { *__z = *__x; }, __is_vector); + __brick_copy_by_mask(__first + __i, __first + (__i + __len), __result + __initial, __mask + __i, + [](_RandomAccessIterator __x, _OutputIterator __z) { *__z = *__x; }, + __is_vector); }, [&__m](_DifferenceType __total) { __m = __total; }); return __result + __m; @@ -1448,7 +1446,7 @@ __pattern_reverse_copy(_ExecutionPolicy&&, _BidirectionalIterator __first, _BidirectionalIterator __last, _OutputIterator __d_first, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_reverse_copy(__first, __last, __d_first, __is_vector); + return __brick_reverse_copy(__first, __last, __d_first, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1529,7 +1527,7 @@ __pattern_rotate(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_rotate(__first, __middle, __last, __is_vector); + return __brick_rotate(__first, __middle, __last, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1619,7 +1617,7 @@ __pattern_rotate_copy(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last, _OutputIterator __result, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_rotate_copy(__first, __middle, __last, __result, __is_vector); + return __brick_rotate_copy(__first, __middle, __last, __result, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1698,7 +1696,7 @@ __pattern_is_partitioned(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_is_partitioned(__first, __last, __pred, __is_vector); + return __brick_is_partitioned(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1827,7 +1825,7 @@ __pattern_partition(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_partition(__first, __last, __pred, __is_vector); + return __brick_partition(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -1926,7 +1924,7 @@ _UnaryPredicate __pred, _IsVector __is_vector, /*is_parallelization=*/std::false_type) noexcept { - return internal::__brick_stable_partition(__first, __last, __pred, __is_vector); + return __brick_stable_partition(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2014,7 +2012,7 @@ _OutputIterator1 __out_true, _OutputIterator2 __out_false, _UnaryPredicate __pred, _IsVector __is_vector, /*is_parallelization=*/std::false_type) noexcept { - return internal::__brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector); + return __brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2031,30 +2029,28 @@ if (_DifferenceType(1) < __n) { __par_backend::__buffer __mask_buf(__n); - return internal::__except_handler( - [&__exec, __n, __first, __out_true, __out_false, __is_vector, __pred, &__mask_buf]() { - bool* __mask = __mask_buf.get(); - _ReturnType __m{}; - __par_backend::parallel_strict_scan( - std::forward<_ExecutionPolicy>(__exec), __n, std::make_pair(_DifferenceType(0), _DifferenceType(0)), - [=](_DifferenceType __i, _DifferenceType __len) { // Reduce - return internal::__brick_calc_mask_1<_DifferenceType>(__first + __i, __first + (__i + __len), - __mask + __i, __pred, __is_vector); - }, - [](const _ReturnType& __x, const _ReturnType& __y) -> _ReturnType { - return std::make_pair(__x.first + __y.first, __x.second + __y.second); - }, // Combine - [=](_DifferenceType __i, _DifferenceType __len, _ReturnType __initial) { // Scan - internal::__brick_partition_by_mask(__first + __i, __first + (__i + __len), - __out_true + __initial.first, - __out_false + __initial.second, __mask + __i, __is_vector); - }, - [&__m](_ReturnType __total) { __m = __total; }); - return std::make_pair(__out_true + __m.first, __out_false + __m.second); - }); + return __except_handler([&__exec, __n, __first, __out_true, __out_false, __is_vector, __pred, &__mask_buf]() { + bool* __mask = __mask_buf.get(); + _ReturnType __m{}; + __par_backend::parallel_strict_scan( + std::forward<_ExecutionPolicy>(__exec), __n, std::make_pair(_DifferenceType(0), _DifferenceType(0)), + [=](_DifferenceType __i, _DifferenceType __len) { // Reduce + return __brick_calc_mask_1<_DifferenceType>(__first + __i, __first + (__i + __len), __mask + __i, + __pred, __is_vector); + }, + [](const _ReturnType& __x, const _ReturnType& __y) -> _ReturnType { + return std::make_pair(__x.first + __y.first, __x.second + __y.second); + }, // Combine + [=](_DifferenceType __i, _DifferenceType __len, _ReturnType __initial) { // Scan + __brick_partition_by_mask(__first + __i, __first + (__i + __len), __out_true + __initial.first, + __out_false + __initial.second, __mask + __i, __is_vector); + }, + [&__m](_ReturnType __total) { __m = __total; }); + return std::make_pair(__out_true + __m.first, __out_false + __m.second); + }); } // trivial sequence - use serial algorithm - return internal::__brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector); + return __brick_partition_copy(__first, __last, __out_true, __out_false, __pred, __is_vector); } #endif @@ -2104,7 +2100,7 @@ __pattern_stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp, _IsVector /*is_vector*/, /*is_parallel=*/std::true_type) { - internal::__except_handler([&]() { + __except_handler([&]() { __par_backend::__parallel_stable_sort(std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, [](_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { std::stable_sort(__first, __last, __comp); }); @@ -2254,7 +2250,7 @@ __pattern_adjacent_find(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred, /* is_parallel */ std::false_type, _IsVector __is_vector, bool __or_semantic) noexcept { - return internal::__brick_adjacent_find(__first, __last, __pred, __is_vector, __or_semantic); + return __brick_adjacent_find(__first, __last, __pred, __is_vector, __or_semantic); } #if __PSTL_USE_PAR_POLICIES @@ -2267,7 +2263,7 @@ if (__last - __first < 2) return __last; - return internal::__except_handler([&]() { + return __except_handler([&]() { return __par_backend::__parallel_reduce( std::forward<_ExecutionPolicy>(__exec), __first, __last, __last, [__last, __pred, __is_vector, __or_semantic](_RandomAccessIterator __begin, _RandomAccessIterator __end, @@ -2291,7 +2287,7 @@ //correct the global result iterator if the "brick" returns a local "__last" const _RandomAccessIterator __res = - internal::__brick_adjacent_find(__begin, __end, __pred, __is_vector, __or_semantic); + __brick_adjacent_find(__begin, __end, __pred, __is_vector, __or_semantic); if (__res < __end) __value = __res; } @@ -2390,7 +2386,7 @@ __pattern_fill(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value, /*is_parallel=*/std::false_type, _IsVector __is_vector) noexcept { - internal::__brick_fill(__first, __last, __value, __is_vector); + __brick_fill(__first, __last, __value, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2402,7 +2398,7 @@ return __except_handler([&__exec, __first, __last, &__value, __is_vector]() { __par_backend::__parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last, [&__value, __is_vector](_ForwardIterator __begin, _ForwardIterator __end) { - internal::__brick_fill(__begin, __end, __value, __is_vector); + __brick_fill(__begin, __end, __value, __is_vector); }); return __last; }); @@ -2428,7 +2424,7 @@ __pattern_fill_n(_ExecutionPolicy&&, _OutputIterator __first, _Size __count, const _Tp& __value, /*is_parallel=*/std::false_type, _IsVector __is_vector) noexcept { - return internal::__brick_fill_n(__first, __count, __value, __is_vector); + return __brick_fill_n(__first, __count, __value, __is_vector); } template @@ -2436,8 +2432,8 @@ __pattern_fill_n(_ExecutionPolicy&& __exec, _OutputIterator __first, _Size __count, const _Tp& __value, /*is_parallel=*/std::true_type, _IsVector __is_vector) { - return internal::__pattern_fill(std::forward<_ExecutionPolicy>(__exec), __first, __first + __count, __value, - std::true_type(), __is_vector); + return __pattern_fill(std::forward<_ExecutionPolicy>(__exec), __first, __first + __count, __value, std::true_type(), + __is_vector); } //------------------------------------------------------------------------ @@ -2464,7 +2460,7 @@ __pattern_generate(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _Generator __g, /*is_parallel=*/std::false_type, _IsVector __is_vector) noexcept { - internal::__brick_generate(__first, __last, __g, __is_vector); + __brick_generate(__first, __last, __g, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2473,10 +2469,10 @@ __pattern_generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g, /*is_parallel=*/std::true_type, _IsVector __is_vector) { - return internal::__except_handler([&]() { + return __except_handler([&]() { __par_backend::__parallel_for(std::forward<_ExecutionPolicy>(__exec), __first, __last, [__g, __is_vector](_ForwardIterator __begin, _ForwardIterator __end) { - internal::__brick_generate(__begin, __end, __g, __is_vector); + __brick_generate(__begin, __end, __g, __is_vector); }); return __last; }); @@ -2502,7 +2498,7 @@ __pattern_generate_n(_ExecutionPolicy&&, _OutputIterator __first, _Size __count, _Generator __g, /*is_parallel=*/std::false_type, _IsVector __is_vector) noexcept { - return internal::__brick_generate_n(__first, __count, __g, __is_vector); + return __brick_generate_n(__first, __count, __g, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2511,10 +2507,10 @@ __pattern_generate_n(_ExecutionPolicy&& __exec, _OutputIterator __first, _Size __count, _Generator __g, /*is_parallel=*/std::true_type, _IsVector __is_vector) { - static_assert(internal::__is_random_access_iterator<_OutputIterator>::value, + static_assert(__is_random_access_iterator<_OutputIterator>::value, "Pattern-brick error. Should be a random access iterator."); - return internal::__pattern_generate(std::forward<_ExecutionPolicy>(__exec), __first, __first + __count, __g, - std::true_type(), __is_vector); + return __pattern_generate(std::forward<_ExecutionPolicy>(__exec), __first, __first + __count, __g, std::true_type(), + __is_vector); } #endif @@ -2547,7 +2543,7 @@ __pattern_remove_if(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, _IsVector __is_vector, /*is_parallel*/ std::false_type) noexcept { - return internal::__brick_remove_if(__first, __last, __pred, __is_vector); + return __brick_remove_if(__first, __last, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2604,7 +2600,7 @@ _ForwardIterator2 __last2, _OutputIterator __d_first, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_merge(__first1, __last1, __first2, __last2, __d_first, __comp, __is_vector); + return __brick_merge(__first1, __last1, __first2, __last2, __d_first, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2650,7 +2646,7 @@ _BidirectionalIterator __last, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - internal::__brick_inplace_merge(__first, __middle, __last, __comp, __is_vector); + __brick_inplace_merge(__first, __middle, __last, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -2730,7 +2726,7 @@ return !__comp(*__first1, *__first2) && !__comp(*__first2, *__first1); return __except_handler([&]() { - return !internal::__parallel_or( + return !__parallel_or( std::forward<_ExecutionPolicy>(__exec), __first2, __last2, [__first1, __last1, __first2, __last2, &__comp](_ForwardIterator2 __i, _ForwardIterator2 __j) { assert(__j > __i); @@ -3008,7 +3004,7 @@ _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_set_union(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); + return __brick_set_union(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3068,7 +3064,7 @@ _ForwardIterator2 __first2, _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_set_intersection(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); + return __brick_set_intersection(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3165,7 +3161,7 @@ _ForwardIterator2 __first2, _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_set_difference(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); + return __brick_set_difference(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3261,8 +3257,7 @@ _ForwardIterator2 __first2, _ForwardIterator2 __last2, _OutputIterator __result, _Compare __comp, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_set_symmetric_difference(__first1, __last1, __first2, __last2, __result, __comp, - __is_vector); + return __brick_set_symmetric_difference(__first1, __last1, __first2, __last2, __result, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3322,7 +3317,7 @@ __pattern_is_heap_until(_ExecutionPolicy&&, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_is_heap_until(__first, __last, __comp, __is_vector); + return __brick_is_heap_until(__first, __last, __comp, __is_vector); } template @@ -3360,11 +3355,11 @@ if (__last - __first < 2) return __last; - return internal::__except_handler([&]() { - return internal::__parallel_find( + return __except_handler([&]() { + return __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, [__first, __comp, __is_vector](_RandomAccessIterator __i, _RandomAccessIterator __j) { - return internal::is_heap_until_local(__first, __i - __first, __j - __first, __comp, __is_vector); + return is_heap_until_local(__first, __i - __first, __j - __first, __comp, __is_vector); }, std::less::difference_type>(), /*is_first=*/true); }); @@ -3400,7 +3395,7 @@ __pattern_min_element(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_min_element(__first, __last, __comp, __is_vector); + return __brick_min_element(__first, __last, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3412,16 +3407,16 @@ if (__first == __last) return __last; - return internal::__except_handler([&]() { + return __except_handler([&]() { return __par_backend::__parallel_reduce( std::forward<_ExecutionPolicy>(__exec), __first + 1, __last, __first, [=](_RandomAccessIterator __begin, _RandomAccessIterator __end, _RandomAccessIterator __init) -> _RandomAccessIterator { const _RandomAccessIterator subresult = __brick_min_element(__begin, __end, __comp, __is_vector); - return internal::__cmp_iterators_by_values(__init, subresult, __comp); + return __cmp_iterators_by_values(__init, subresult, __comp); }, [=](_RandomAccessIterator __it1, _RandomAccessIterator __it2) -> _RandomAccessIterator { - return internal::__cmp_iterators_by_values(__it1, __it2, __comp); + return __cmp_iterators_by_values(__it1, __it2, __comp); }); }); } @@ -3456,7 +3451,7 @@ __pattern_minmax_element(_ExecutionPolicy&&, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_minmax_element(__first, __last, __comp, __is_vector); + return __brick_minmax_element(__first, __last, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3468,21 +3463,21 @@ if (__first == __last) return std::make_pair(__first, __first); - return internal::__except_handler([&]() { + return __except_handler([&]() { typedef std::pair<_ForwardIterator, _ForwardIterator> _Result; return __par_backend::__parallel_reduce( std::forward<_ExecutionPolicy>(__exec), __first + 1, __last, std::make_pair(__first, __first), [=](_ForwardIterator __begin, _ForwardIterator __end, _Result __init) -> _Result { const _Result __subresult = __brick_minmax_element(__begin, __end, __comp, __is_vector); - return std::make_pair(internal::__cmp_iterators_by_values(__subresult.first, __init.first, __comp), - internal::__cmp_iterators_by_values(__init.second, __subresult.second, - internal::__not_pred<_Compare>(__comp))); + return std::make_pair( + __cmp_iterators_by_values(__subresult.first, __init.first, __comp), + __cmp_iterators_by_values(__init.second, __subresult.second, __not_pred<_Compare>(__comp))); }, [=](_Result __p1, _Result __p2) -> _Result { - return std::make_pair(internal::__cmp_iterators_by_values(__p1.first, __p2.first, __comp), - internal::__cmp_iterators_by_values(__p2.second, __p1.second, - internal::__not_pred<_Compare>(__comp))); + return std::make_pair( + __cmp_iterators_by_values(__p1.first, __p2.first, __comp), + __cmp_iterators_by_values(__p2.second, __p1.second, __not_pred<_Compare>(__comp))); }); }); } @@ -3493,8 +3488,8 @@ //------------------------------------------------------------------------ template std::pair<_ForwardIterator1, _ForwardIterator2> -mismatch_serial(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, - _ForwardIterator2 __last2, _BinaryPredicate __pred) +__mismatch_serial(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, + _ForwardIterator2 __last2, _BinaryPredicate __pred) { #if __PSTL_CPP14_2RANGE_MISMATCH_EQUAL_PRESENT return std::mismatch(__first1, __last1, __first2, __last2, __pred); @@ -3511,7 +3506,7 @@ __brick_mismatch(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Predicate __pred, /* __is_vector = */ std::false_type) noexcept { - return internal::mismatch_serial(__first1, __last1, __first2, __last2, __pred); + return __mismatch_serial(__first1, __last1, __first2, __last2, __pred); } template @@ -3529,7 +3524,7 @@ _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Predicate __pred, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_mismatch(__first1, __last1, __first2, __last2, __pred, __is_vector); + return __brick_mismatch(__first1, __last1, __first2, __last2, __pred, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3540,13 +3535,13 @@ _RandomAccessIterator2 __first2, _RandomAccessIterator2 __last2, _Predicate __pred, _IsVector __is_vector, /* is_parallel = */ std::true_type) noexcept { - return internal::__except_handler([&]() { + return __except_handler([&]() { auto __n = std::min(__last1 - __first1, __last2 - __first2); - auto __result = internal::__parallel_find( + auto __result = __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first1, __first1 + __n, [__first1, __first2, __pred, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j) { - return internal::__brick_mismatch(__i, __j, __first2 + (__i - __first1), __first2 + (__j - __first1), - __pred, __is_vector) + return __brick_mismatch(__i, __j, __first2 + (__i - __first1), __first2 + (__j - __first1), __pred, + __is_vector) .first; }, std::less::difference_type>(), /*is_first=*/true); @@ -3610,7 +3605,7 @@ _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Compare __comp, _IsVector __is_vector, /* is_parallel = */ std::false_type) noexcept { - return internal::__brick_lexicographical_compare(__first1, __last1, __first2, __last2, __comp, __is_vector); + return __brick_lexicographical_compare(__first1, __last1, __first2, __last2, __comp, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -3635,7 +3630,7 @@ --__last1; --__last2; auto __n = std::min(__last1 - __first1, __last2 - __first2); - auto __result = internal::__parallel_find( + auto __result = __parallel_find( std::forward<_ExecutionPolicy>(__exec), __first1, __first1 + __n, [__first1, __first2, &__comp, __is_vector](_ForwardIterator1 __i, _ForwardIterator1 __j) { return __brick_mismatch(__i, __j, __first2 + (__i - __first1), __first2 + (__j - __first1), @@ -3659,7 +3654,7 @@ } #endif -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_algorithm_impl_H */ Index: include/pstl/internal/execution_defs.h =================================================================== --- include/pstl/internal/execution_defs.h +++ include/pstl/internal/execution_defs.h @@ -149,13 +149,13 @@ } // namespace v1 } // namespace execution -namespace internal +namespace __internal { template -using enable_if_execution_policy = +using __enable_if_execution_policy = typename std::enable_if<__pstl::execution::is_execution_policy::type>::value, T>::type; -} // namespace internal +} // namespace __internal } // namespace __pstl Index: include/pstl/internal/execution_impl.h =================================================================== --- include/pstl/internal/execution_impl.h +++ include/pstl/internal/execution_impl.h @@ -17,7 +17,7 @@ namespace __pstl { -namespace internal +namespace __internal { using namespace __pstl::execution; @@ -109,23 +109,20 @@ using __collector_t = typename __policy_traits::type>::__collector_type; template -using __allow_vector = typename internal::__policy_traits::type>::__allow_vector; +using __allow_vector = typename __policy_traits::type>::__allow_vector; template -using __allow_unsequenced = - typename internal::__policy_traits::type>::__allow_unsequenced; +using __allow_unsequenced = typename __policy_traits::type>::__allow_unsequenced; template -using __allow_parallel = - typename internal::__policy_traits::type>::__allow_parallel; +using __allow_parallel = typename __policy_traits::type>::__allow_parallel; template auto __is_vectorization_preferred(_ExecutionPolicy&& __exec) -> decltype(__lazy_and(__exec.__allow_vector(), typename __is_random_access_iterator<_IteratorTypes...>::type())) { - return internal::__lazy_and(__exec.__allow_vector(), - typename __is_random_access_iterator<_IteratorTypes...>::type()); + return __lazy_and(__exec.__allow_vector(), typename __is_random_access_iterator<_IteratorTypes...>::type()); } template @@ -133,8 +130,7 @@ __is_parallelization_preferred(_ExecutionPolicy&& __exec) -> decltype(__lazy_and(__exec.__allow_parallel(), typename __is_random_access_iterator<_IteratorTypes...>::type())) { - return internal::__lazy_and(__exec.__allow_parallel(), - typename __is_random_access_iterator<_IteratorTypes...>::type()); + return __lazy_and(__exec.__allow_parallel(), typename __is_random_access_iterator<_IteratorTypes...>::type()); } template @@ -153,7 +149,7 @@ typedef std::integral_constant type; }; -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_execution_impl_H */ Index: include/pstl/internal/glue_algorithm_defs.h =================================================================== --- include/pstl/internal/glue_algorithm_defs.h +++ include/pstl/internal/glue_algorithm_defs.h @@ -20,422 +20,422 @@ // [alg.any_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); // [alg.all_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> all_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); // [alg.none_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> none_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); // [alg.foreach] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> for_each(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Function __f); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> for_each_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n, _Function __f); // [alg.find] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find_if_not(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value); // [alg.find.end] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_end(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_end(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last); // [alg.find_first_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_first_of(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_first_of(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last); // [alg.adjacent_find] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> adjacent_find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> adjacent_find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred); // [alg.count] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, - typename iterator_traits<_ForwardIterator>::difference_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::difference_type> count(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, - typename iterator_traits<_ForwardIterator>::difference_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::difference_type> count_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred); // [alg.search] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> search(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> search(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> search_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> search_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value); // [alg.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy_n(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Size __n, _ForwardIterator2 __result); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 result, _Predicate __pred); // [alg.swap] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> swap_ranges(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2); // [alg.transform] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _UnaryOperation __op); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> transform(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator __result, _BinaryOperation __op); // [alg.replace] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> replace_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, const _Tp& __new_value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> replace(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> replace_copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _UnaryPredicate __pred, const _Tp& __new_value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> replace_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, const _Tp& __old_value, const _Tp& __new_value); // [alg.fill] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> fill_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __count, const _Tp& __value); // [alg.generate] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> generate_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size count, _Generator __g); // [alg.remove] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> remove_copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Predicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> remove_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, const _Tp& __value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> remove_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> remove(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value); // [alg.unique] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> unique_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> unique_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result); // [alg.reverse] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> reverse(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> reverse_copy(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, _ForwardIterator __d_first); // [alg.rotate] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> rotate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> rotate_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __middle, _ForwardIterator1 __last, _ForwardIterator2 __result); // [alg.partitions] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_partitioned(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> partition(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _BidirectionalIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _BidirectionalIterator> stable_partition(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, _UnaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> partition_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _ForwardIterator1 __out_true, _ForwardIterator2 __out_false, _UnaryPredicate __pred); // [alg.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last); // [stable.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last); // [mismatch] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __pred); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2); // [alg.equal] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __p); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __p); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2); // [alg.move] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> move(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first); // [partial.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last); // [partial.sort.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _RandomAccessIterator __d_first, _RandomAccessIterator __d_last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _RandomAccessIterator __d_first, _RandomAccessIterator __d_last); // [is.sorted] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> is_sorted_until(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> is_sorted_until(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_sorted(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_sorted(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); // [alg.nth.element] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last); // [alg.merge] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> merge(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __d_first, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> merge(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __d_first); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last); // [includes] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2); @@ -443,12 +443,12 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_union(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_union(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result); @@ -456,12 +456,12 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_intersection(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_intersection(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result); @@ -469,12 +469,12 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result); @@ -482,68 +482,68 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_symmetric_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator result, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_symmetric_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result); // [is.heap] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_heap(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_heap(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last); // [alg.min.max] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> min_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> min_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> max_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> max_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); // [alg.lex.comparison] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Compare __comp); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2); Index: include/pstl/internal/glue_algorithm_impl.h =================================================================== --- include/pstl/internal/glue_algorithm_impl.h +++ include/pstl/internal/glue_algorithm_impl.h @@ -23,30 +23,30 @@ // [alg.any_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) { using namespace __pstl; - return internal::__pattern_any_of( + return __internal::__pattern_any_of( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [alg.all_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> all_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Pred __pred) { return !std::any_of(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__not_pred<_Pred>(__pred)); + __pstl::__internal::__not_pred<_Pred>(__pred)); } // [alg.none_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> none_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) { return !std::any_of(std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred); @@ -55,121 +55,121 @@ // [alg.foreach] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> for_each(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Function __f) { using namespace __pstl; - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, __f, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, __f, + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> for_each_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n, _Function __f) { using namespace __pstl; - return internal::__pattern_walk1_n( + return __internal::__pattern_walk1_n( std::forward<_ExecutionPolicy>(__exec), __first, __n, __f, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [alg.find] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) { using namespace __pstl; - return internal::__pattern_find_if( + return __internal::__pattern_find_if( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find_if_not(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) { return std::find_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__not_pred<_Predicate>(__pred)); + __pstl::__internal::__not_pred<_Predicate>(__pred)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { return std::find_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__equal_value<_Tp>(__value)); + __pstl::__internal::__equal_value<_Tp>(__value)); } // [alg.find.end] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_end(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_find_end( + return __internal::__pattern_find_end( std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_end(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last) { return std::find_end(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, - __pstl::internal::__pstl_equal()); + __pstl::__internal::__pstl_equal()); } // [alg.find_first_of] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_first_of(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_find_first_of( + return __internal::__pattern_find_first_of( std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> find_first_of(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last) { return std::find_first_of(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, - __pstl::internal::__pstl_equal()); + __pstl::__internal::__pstl_equal()); } // [alg.adjacent_find] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> adjacent_find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; using namespace __pstl; - return internal::__pattern_adjacent_find( + return __internal::__pattern_adjacent_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, std::equal_to<_ValueType>(), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> adjacent_find(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_adjacent_find( + return __internal::__pattern_adjacent_find( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); } // [alg.count] @@ -178,68 +178,68 @@ // so that we do not have to include . template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, - typename iterator_traits<_ForwardIterator>::difference_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::difference_type> count(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; using namespace __pstl; - return internal::__pattern_count( + return __internal::__pattern_count( std::forward<_ExecutionPolicy>(__exec), __first, __last, [&__value](const _ValueType& __x) { return __value == __x; }, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, - typename iterator_traits<_ForwardIterator>::difference_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::difference_type> count_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred) { using namespace __pstl; - return internal::__pattern_count( + return __internal::__pattern_count( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [alg.search] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> search(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_search( + return __internal::__pattern_search( std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator1> search(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __s_first, _ForwardIterator2 __s_last) { return std::search(std::forward<_ExecutionPolicy>(__exec), __first, __last, __s_first, __s_last, - __pstl::internal::__pstl_equal()); + __pstl::__internal::__pstl_equal()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> search_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_search_n( + return __internal::__pattern_search_n( std::forward<_ExecutionPolicy>(__exec), __first, __last, __count, __value, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> search_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Size __count, const _Tp& __value) { @@ -250,89 +250,89 @@ // [alg.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result) { using namespace __pstl; const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); - return internal::__pattern_walk2_brick( + return __internal::__pattern_walk2_brick( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, [__is_vector](_ForwardIterator1 __begin, _ForwardIterator1 __end, _ForwardIterator2 __res) { - return internal::__brick_copy(__begin, __end, __res, __is_vector); + return __internal::__brick_copy(__begin, __end, __res, __is_vector); }, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy_n(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _Size __n, _ForwardIterator2 __result) { using namespace __pstl; const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); - return internal::__pattern_walk2_brick_n( + return __internal::__pattern_walk2_brick_n( std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, [__is_vector](_ForwardIterator1 __begin, _Size __sz, _ForwardIterator2 __res) { - return internal::__brick_copy_n(__begin, __sz, __res, __is_vector); + return __internal::__brick_copy_n(__begin, __sz, __res, __is_vector); }, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Predicate __pred) { using namespace __pstl; - return internal::__pattern_copy_if( + return __internal::__pattern_copy_if( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } // [alg.swap] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> swap_ranges(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) { using namespace __pstl; typedef typename iterator_traits<_ForwardIterator1>::reference _ReferenceType1; typedef typename iterator_traits<_ForwardIterator2>::reference _ReferenceType2; - return internal::__pattern_walk2( + return __internal::__pattern_walk2( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, [](_ReferenceType1 __x, _ReferenceType2 __y) { using std::swap; swap(__x, __y); }, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } // [alg.transform] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _UnaryOperation __op) { typedef typename iterator_traits<_ForwardIterator1>::reference _InputType; typedef typename iterator_traits<_ForwardIterator2>::reference _OutputType; using namespace __pstl; - return internal::__pattern_walk2( + return __internal::__pattern_walk2( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, [__op](_InputType __x, _OutputType __y) mutable { __y = __op(__x); }, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> transform(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator __result, _BinaryOperation __op) { @@ -340,315 +340,316 @@ typedef typename iterator_traits<_ForwardIterator2>::reference _Input2Type; typedef typename iterator_traits<_ForwardIterator>::reference _OutputType; using namespace __pstl; - return internal::__pattern_walk3( + return __internal::__pattern_walk3( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __result, [__op](_Input1Type x, _Input2Type y, _OutputType z) mutable { z = __op(x, y); }, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } // [alg.replace] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> replace_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred, const _Tp& __new_value) { using namespace __pstl; typedef typename iterator_traits<_ForwardIterator>::reference _ElementType; - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [&__pred, &__new_value](_ElementType __elem) { - if (__pred(__elem)) - { - __elem = __new_value; - } - }, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [&__pred, &__new_value](_ElementType __elem) { + if (__pred(__elem)) + { + __elem = __new_value; + } + }, + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> replace(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_value, const _Tp& __new_value) { std::replace_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__equal_value<_Tp>(__old_value), __new_value); + __pstl::__internal::__equal_value<_Tp>(__old_value), __new_value); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> replace_copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _UnaryPredicate __pred, const _Tp& __new_value) { typedef typename iterator_traits<_ForwardIterator1>::reference _InputType; typedef typename iterator_traits<_ForwardIterator2>::reference _OutputType; using namespace __pstl; - return internal::__pattern_walk2( + return __internal::__pattern_walk2( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, [__pred, &__new_value](_InputType __x, _OutputType __y) mutable { __y = __pred(__x) ? __new_value : __x; }, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> replace_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, const _Tp& __old_value, const _Tp& __new_value) { return std::replace_copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - __pstl::internal::__equal_value<_Tp>(__old_value), __new_value); + __pstl::__internal::__equal_value<_Tp>(__old_value), __new_value); } // [alg.fill] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { using namespace __pstl; - internal::__pattern_fill(std::forward<_ExecutionPolicy>(__exec), __first, __last, __value, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__pattern_fill(std::forward<_ExecutionPolicy>(__exec), __first, __last, __value, + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> fill_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __count, const _Tp& __value) { if (__count <= 0) return __first; using namespace __pstl; - return internal::__pattern_fill_n( + return __internal::__pattern_fill_n( std::forward<_ExecutionPolicy>(__exec), __first, __count, __value, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [alg.generate] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> generate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Generator __g) { using namespace __pstl; - internal::__pattern_generate(std::forward<_ExecutionPolicy>(__exec), __first, __last, __g, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__pattern_generate( + std::forward<_ExecutionPolicy>(__exec), __first, __last, __g, + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> generate_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __count, _Generator __g) { if (__count <= 0) return __first; using namespace __pstl; - return internal::__pattern_generate_n( + return __internal::__pattern_generate_n( std::forward<_ExecutionPolicy>(__exec), __first, __count, __g, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [alg.remove] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> remove_copy_if(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Predicate __pred) { return std::copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - __pstl::internal::__not_pred<_Predicate>(__pred)); + __pstl::__internal::__not_pred<_Predicate>(__pred)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> remove_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, const _Tp& __value) { return std::copy_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - __pstl::internal::__not_equal_value<_Tp>(__value)); + __pstl::__internal::__not_equal_value<_Tp>(__value)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> remove_if(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_remove_if( + return __internal::__pattern_remove_if( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> remove(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { return std::remove_if(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__equal_value<_Tp>(__value)); + __pstl::__internal::__equal_value<_Tp>(__value)); } // [alg.unique] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_unique( + return __internal::__pattern_unique( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> unique(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { - return std::unique(std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::__pstl_equal()); + return std::unique(std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::__internal::__pstl_equal()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> unique_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_unique_copy( + return __internal::__pattern_unique_copy( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> unique_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result) { - return std::unique_copy(__exec, __first, __last, __result, __pstl::internal::__pstl_equal()); + return std::unique_copy(__exec, __first, __last, __result, __pstl::__internal::__pstl_equal()); } // [alg.reverse] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> reverse(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last) { using namespace __pstl; - internal::__pattern_reverse( + __internal::__pattern_reverse( std::forward<_ExecutionPolicy>(__exec), __first, __last, - internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> reverse_copy(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, _ForwardIterator __d_first) { using namespace __pstl; - return internal::__pattern_reverse_copy( + return __internal::__pattern_reverse_copy( std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, - internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator, _ForwardIterator>(__exec)); } // [alg.rotate] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> rotate(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __middle, _ForwardIterator __last) { using namespace __pstl; - return internal::__pattern_rotate( + return __internal::__pattern_rotate( std::forward<_ExecutionPolicy>(__exec), __first, __middle, __last, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> rotate_copy(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __middle, _ForwardIterator1 __last, _ForwardIterator2 __result) { using namespace __pstl; - return internal::__pattern_rotate_copy( + return __internal::__pattern_rotate_copy( std::forward<_ExecutionPolicy>(__exec), __first, __middle, __last, __result, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } // [alg.partitions] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_partitioned(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_is_partitioned( + return __internal::__pattern_is_partitioned( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> partition(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _UnaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_partition( + return __internal::__pattern_partition( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _BidirectionalIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _BidirectionalIterator> stable_partition(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __last, _UnaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_stable_partition( + return __internal::__pattern_stable_partition( std::forward<_ExecutionPolicy>(__exec), __first, __last, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> partition_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _ForwardIterator1 __out_true, _ForwardIterator2 __out_false, _UnaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_partition_copy( + return __internal::__pattern_partition_copy( std::forward<_ExecutionPolicy>(__exec), __first, __last, __out_true, __out_false, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator, _ForwardIterator1, - _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator, _ForwardIterator1, - _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator, _ForwardIterator1, + _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator, _ForwardIterator1, + _ForwardIterator2>(__exec)); } // [alg.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { typedef typename iterator_traits<_RandomAccessIterator>::value_type _InputType; using namespace __pstl; - return internal::__pattern_sort( + return __internal::__pattern_sort( std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), typename std::is_move_constructible<_InputType>::type()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename std::iterator_traits<_RandomAccessIterator>::value_type _InputType; @@ -658,18 +659,18 @@ // [stable.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_stable_sort( + return __internal::__pattern_stable_sort( std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> stable_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename std::iterator_traits<_RandomAccessIterator>::value_type _InputType; @@ -679,19 +680,19 @@ // [mismatch] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __pred) { using namespace __pstl; - return internal::__pattern_mismatch( + return __internal::__pattern_mismatch( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __pred, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __pred) { @@ -700,16 +701,16 @@ } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) { return std::mismatch(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, - __pstl::internal::__pstl_equal()); + __pstl::__internal::__pstl_equal()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator1, _ForwardIterator2>> mismatch(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) { //TODO: to get rid of "distance" @@ -720,27 +721,27 @@ // [alg.equal] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _BinaryPredicate __p) { using namespace __pstl; - return internal::__pattern_equal( + return __internal::__pattern_equal( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __p, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2) { return std::equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, - __pstl::internal::__pstl_equal()); + __pstl::__internal::__pstl_equal()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _BinaryPredicate __p) { @@ -752,46 +753,47 @@ } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> equal(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) { - return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __pstl::internal::__pstl_equal()); + return equal(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, + __pstl::__internal::__pstl_equal()); } // [alg.move] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> move(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first) { using namespace __pstl; const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec); - return internal::__pattern_walk2_brick( + return __internal::__pattern_walk2_brick( std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, [__is_vector](_ForwardIterator1 __begin, _ForwardIterator1 __end, _ForwardIterator2 __res) { - return internal::__brick_move(__begin, __end, __res, __is_vector); + return __internal::__brick_move(__begin, __end, __res, __is_vector); }, - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } // [partial.sort] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last, _Compare __comp) { using namespace __pstl; - internal::__pattern_partial_sort( + __internal::__pattern_partial_sort( std::forward<_ExecutionPolicy>(__exec), __first, __middle, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> partial_sort(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __middle, _RandomAccessIterator __last) { @@ -802,41 +804,41 @@ // [partial.sort.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _RandomAccessIterator __d_first, _RandomAccessIterator __d_last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_partial_sort_copy( + return __internal::__pattern_partial_sort_copy( std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, __d_last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator, _RandomAccessIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator, _RandomAccessIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> partial_sort_copy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _RandomAccessIterator __d_first, _RandomAccessIterator __d_last) { return std::partial_sort_copy(std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, __d_last, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } // [is.sorted] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> is_sorted_until(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp) { using namespace __pstl; - const _ForwardIterator __res = internal::__pattern_adjacent_find( - std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::internal::__reorder_pred<_Compare>(__comp), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); + const _ForwardIterator __res = __internal::__pattern_adjacent_find( + std::forward<_ExecutionPolicy>(__exec), __first, __last, __pstl::__internal::__reorder_pred<_Compare>(__comp), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*first_semantic*/ false); return __res == __last ? __last : std::next(__res); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> is_sorted_until(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename std::iterator_traits<_ForwardIterator>::value_type _InputType; @@ -844,19 +846,19 @@ } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_sorted(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_adjacent_find( - std::forward<_ExecutionPolicy>(__exec), __first, __last, internal::__reorder_pred<_Compare>(__comp), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + return __internal::__pattern_adjacent_find( + std::forward<_ExecutionPolicy>(__exec), __first, __last, __internal::__reorder_pred<_Compare>(__comp), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), /*or_semantic*/ true) == __last; } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_sorted(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename std::iterator_traits<_ForwardIterator>::value_type _InputType; @@ -866,42 +868,42 @@ // [alg.merge] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> merge(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __d_first, _Compare __comp) { using namespace __pstl; - return internal::__pattern_merge( + return __internal::__pattern_merge( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __d_first, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> merge(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __d_first) { return std::merge(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __d_first, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last, _Compare __comp) { using namespace __pstl; - internal::__pattern_inplace_merge( + __internal::__pattern_inplace_merge( std::forward<_ExecutionPolicy>(__exec), __first, __middle, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _BidirectionalIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> inplace_merge(_ExecutionPolicy&& __exec, _BidirectionalIterator __first, _BidirectionalIterator __middle, _BidirectionalIterator __last) { @@ -912,145 +914,145 @@ // [includes] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Compare __comp) { using namespace __pstl; - return internal::__pattern_includes( + return __internal::__pattern_includes( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> includes(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) { return std::includes(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } // [set.union] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_union(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp) { using namespace __pstl; - return internal::__pattern_set_union( + return __internal::__pattern_set_union( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_union(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result) { return std::set_union(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } // [set.intersection] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_intersection(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp) { using namespace __pstl; - return internal::__pattern_set_intersection( + return __internal::__pattern_set_intersection( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_intersection(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result) { return std::set_intersection(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } // [set.difference] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp) { using namespace __pstl; - return internal::__pattern_set_difference( + return __internal::__pattern_set_difference( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result) { return std::set_difference(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } // [set.symmetric.difference] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_symmetric_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result, _Compare __comp) { using namespace __pstl; - return internal::__pattern_set_symmetric_difference( + return __internal::__pattern_set_symmetric_difference( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __result, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, - _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2, + _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> set_symmetric_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _ForwardIterator __result) { return std::set_symmetric_difference(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, - __result, __pstl::internal::__pstl_less()); + __result, __pstl::__internal::__pstl_less()); } // [is.heap] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_is_heap_until( + return __internal::__pattern_is_heap_until( std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _RandomAccessIterator> is_heap_until(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename std::iterator_traits<_RandomAccessIterator>::value_type _InputType; @@ -1058,14 +1060,14 @@ } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_heap(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp) { return std::is_heap_until(std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp) == __last; } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> is_heap(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __last) { typedef typename std::iterator_traits<_RandomAccessIterator>::value_type _InputType; @@ -1075,18 +1077,18 @@ // [alg.min.max] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> min_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_min_element( + return __internal::__pattern_min_element( std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> min_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename std::iterator_traits<_ForwardIterator>::value_type _InputType; @@ -1094,35 +1096,35 @@ } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> max_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp) { return min_element(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__reorder_pred<_Compare>(__comp)); + __pstl::__internal::__reorder_pred<_Compare>(__comp)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> max_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename std::iterator_traits<_ForwardIterator>::value_type _InputType; return std::min_element(std::forward<_ExecutionPolicy>(__exec), __first, __last, - __pstl::internal::__reorder_pred>(std::less<_InputType>())); + __pstl::__internal::__reorder_pred>(std::less<_InputType>())); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Compare __comp) { using namespace __pstl; - return internal::__pattern_minmax_element( + return __internal::__pattern_minmax_element( std::forward<_ExecutionPolicy>(__exec), __first, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, std::pair<_ForwardIterator, _ForwardIterator>> minmax_element(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; @@ -1132,19 +1134,19 @@ // [alg.nth.element] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last, _Compare __comp) { using namespace __pstl; - internal::__pattern_nth_element( + __internal::__pattern_nth_element( std::forward<_ExecutionPolicy>(__exec), __first, __nth, __last, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _RandomAccessIterator>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> nth_element(_ExecutionPolicy&& __exec, _RandomAccessIterator __first, _RandomAccessIterator __nth, _RandomAccessIterator __last) { @@ -1155,24 +1157,24 @@ // [alg.lex.comparison] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2, _Compare __comp) { using namespace __pstl; - return internal::__pattern_lexicographical_compare( + return __internal::__pattern_lexicographical_compare( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, __comp, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, bool> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool> lexicographical_compare(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _ForwardIterator2 __last2) { return std::lexicographical_compare(std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __last2, - __pstl::internal::__pstl_less()); + __pstl::__internal::__pstl_less()); } } // namespace std Index: include/pstl/internal/glue_memory_defs.h =================================================================== --- include/pstl/internal/glue_memory_defs.h +++ include/pstl/internal/glue_memory_defs.h @@ -18,61 +18,61 @@ // [uninitialized.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_copy(_ExecutionPolicy&& __exec, _InputIterator __first, _InputIterator __last, _ForwardIterator __result); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_copy_n(_ExecutionPolicy&& __exec, _InputIterator __first, _Size __n, _ForwardIterator __result); // [uninitialized.move] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_move(_ExecutionPolicy&& __exec, _InputIterator __first, _InputIterator __last, _ForwardIterator __result); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_move_n(_ExecutionPolicy&& __exec, _InputIterator __first, _Size __n, _ForwardIterator __result); // [uninitialized.fill] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_fill_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n, const _Tp& __value); // [specialized.destroy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> destroy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> destroy_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n); // [uninitialized.construct.default] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_default_construct(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_default_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n); // [uninitialized.construct.value] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_value_construct(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n); } // namespace std Index: include/pstl/internal/glue_memory_impl.h =================================================================== --- include/pstl/internal/glue_memory_impl.h +++ include/pstl/internal/glue_memory_impl.h @@ -19,7 +19,7 @@ // [uninitialized.copy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_copy(_ExecutionPolicy&& __exec, _InputIterator __first, _InputIterator __last, _ForwardIterator __result) { typedef typename iterator_traits<_InputIterator>::value_type _ValueType1; @@ -29,31 +29,31 @@ using namespace __pstl; const auto __is_parallel = - internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (), [&]() { - return internal::__pattern_walk2_brick( + return __internal::__pattern_walk2_brick( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, [__is_vector](_InputIterator __begin, _InputIterator __end, _ForwardIterator __res) { - return internal::__brick_copy(__begin, __end, __res, __is_vector); + return __internal::__brick_copy(__begin, __end, __res, __is_vector); }, __is_parallel); }, [&]() { - return internal::__pattern_walk2(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - [](_ReferenceType1 __val1, _ReferenceType2 __val2) { - ::new (std::addressof(__val2)) _ValueType2(__val1); - }, - __is_vector, __is_parallel); + return __internal::__pattern_walk2(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, + [](_ReferenceType1 __val1, _ReferenceType2 __val2) { + ::new (std::addressof(__val2)) _ValueType2(__val1); + }, + __is_vector, __is_parallel); }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_copy_n(_ExecutionPolicy&& __exec, _InputIterator __first, _Size __n, _ForwardIterator __result) { typedef typename iterator_traits<_InputIterator>::value_type _ValueType1; @@ -63,33 +63,33 @@ using namespace __pstl; const auto __is_parallel = - internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (), [&]() { - return internal::__pattern_walk2_brick_n( + return __internal::__pattern_walk2_brick_n( std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, [__is_vector](_InputIterator __begin, _Size __sz, _ForwardIterator __res) { - return internal::__brick_copy_n(__begin, __sz, __res, __is_vector); + return __internal::__brick_copy_n(__begin, __sz, __res, __is_vector); }, __is_parallel); }, [&]() { - return internal::__pattern_walk2_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, - [](_ReferenceType1 __val1, _ReferenceType2 __val2) { - ::new (std::addressof(__val2)) _ValueType2(__val1); - }, - __is_vector, __is_parallel); + return __internal::__pattern_walk2_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, + [](_ReferenceType1 __val1, _ReferenceType2 __val2) { + ::new (std::addressof(__val2)) _ValueType2(__val1); + }, + __is_vector, __is_parallel); }); } // [uninitialized.move] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_move(_ExecutionPolicy&& __exec, _InputIterator __first, _InputIterator __last, _ForwardIterator __result) { typedef typename iterator_traits<_InputIterator>::value_type _ValueType1; @@ -99,31 +99,31 @@ using namespace __pstl; const auto __is_parallel = - internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (), [&]() { - return internal::__pattern_walk2_brick( + return __internal::__pattern_walk2_brick( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, [__is_vector](_InputIterator __begin, _InputIterator __end, _ForwardIterator __res) { - return internal::__brick_copy(__begin, __end, __res, __is_vector); + return __internal::__brick_copy(__begin, __end, __res, __is_vector); }, __is_parallel); }, [&]() { - return internal::__pattern_walk2(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - [](_ReferenceType1 __val1, _ReferenceType2 __val2) { - ::new (std::addressof(__val2)) _ValueType2(std::move(__val1)); - }, - __is_vector, __is_parallel); + return __internal::__pattern_walk2(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, + [](_ReferenceType1 __val1, _ReferenceType2 __val2) { + ::new (std::addressof(__val2)) _ValueType2(std::move(__val1)); + }, + __is_vector, __is_parallel); }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_move_n(_ExecutionPolicy&& __exec, _InputIterator __first, _Size __n, _ForwardIterator __result) { typedef typename iterator_traits<_InputIterator>::value_type _ValueType1; @@ -133,82 +133,84 @@ using namespace __pstl; const auto __is_parallel = - internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_parallelization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); const auto __is_vector = - internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _InputIterator, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::integral_constant < bool, std::is_trivial<_ValueType1>::value&& std::is_trivial<_ValueType2>::value > (), [&]() { - return internal::__pattern_walk2_brick_n( + return __internal::__pattern_walk2_brick_n( std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, [__is_vector](_InputIterator __begin, _Size __sz, _ForwardIterator __res) { - return internal::__brick_copy_n(__begin, __sz, __res, __is_vector); + return __internal::__brick_copy_n(__begin, __sz, __res, __is_vector); }, __is_parallel); }, [&]() { - return internal::__pattern_walk2_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, - [](_ReferenceType1 __val1, _ReferenceType2 __val2) { - ::new (std::addressof(__val2)) _ValueType2(std::move(__val1)); - }, - __is_vector, __is_parallel); + return __internal::__pattern_walk2_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, __result, + [](_ReferenceType1 __val1, _ReferenceType2 __val2) { + ::new (std::addressof(__val2)) _ValueType2(std::move(__val1)); + }, + __is_vector, __is_parallel); }); } // [uninitialized.fill] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_fill(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - - internal::__invoke_if_else( - std::is_arithmetic<_ValueType>(), - [&]() { - internal::__pattern_walk_brick(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [&__value, &__is_vector](_ForwardIterator __begin, _ForwardIterator __end) { - internal::__brick_fill(__begin, __end, _ValueType(__value), __is_vector); - }, - __is_parallel); - }, - [&]() { - internal::__pattern_walk1( - std::forward<_ExecutionPolicy>(__exec), __first, __last, - [&__value](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(__value); }, __is_vector, - __is_parallel); - }); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + + __internal::__invoke_if_else(std::is_arithmetic<_ValueType>(), + [&]() { + __internal::__pattern_walk_brick( + std::forward<_ExecutionPolicy>(__exec), __first, __last, + [&__value, &__is_vector](_ForwardIterator __begin, _ForwardIterator __end) { + __internal::__brick_fill(__begin, __end, _ValueType(__value), __is_vector); + }, + __is_parallel); + }, + [&]() { + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, + __last, + [&__value](_ReferenceType __val) { + ::new (std::addressof(__val)) _ValueType(__value); + }, + __is_vector, __is_parallel); + }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_fill_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n, const _Tp& __value) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::is_arithmetic<_ValueType>(), [&]() { - return internal::__pattern_walk_brick_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, - [&__value, &__is_vector](_ForwardIterator __begin, _Size __count) { - return internal::__brick_fill_n( - __begin, __count, _ValueType(__value), __is_vector); - }, - __is_parallel); + return __internal::__pattern_walk_brick_n( + std::forward<_ExecutionPolicy>(__exec), __first, __n, + [&__value, &__is_vector](_ForwardIterator __begin, _Size __count) { + return __internal::__brick_fill_n(__begin, __count, _ValueType(__value), __is_vector); + }, + __is_parallel); }, [&]() { - return internal::__pattern_walk1_n( + return __internal::__pattern_walk1_n( std::forward<_ExecutionPolicy>(__exec), __first, __n, [&__value](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(__value); }, __is_vector, __is_parallel); @@ -218,136 +220,136 @@ // [specialized.destroy] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> destroy(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - internal::__invoke_if_not(std::is_trivially_destructible<_ValueType>(), [&]() { - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [](_ReferenceType __val) { __val.~_ValueType(); }, __is_vector, __is_parallel); + __internal::__invoke_if_not(std::is_trivially_destructible<_ValueType>(), [&]() { + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [](_ReferenceType __val) { __val.~_ValueType(); }, __is_vector, __is_parallel); }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> destroy_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::is_trivially_destructible<_ValueType>(), [&]() { return std::next(__first, __n); }, [&]() { - return internal::__pattern_walk1_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, - [](_ReferenceType __val) { __val.~_ValueType(); }, __is_vector, - __is_parallel); + return __internal::__pattern_walk1_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, + [](_ReferenceType __val) { __val.~_ValueType(); }, __is_vector, + __is_parallel); }); } // [uninitialized.construct.default] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_default_construct(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - internal::__invoke_if_not(std::is_trivial<_ValueType>(), [&]() { - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; }, __is_vector, - __is_parallel); + __internal::__invoke_if_not(std::is_trivial<_ValueType>(), [&]() { + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; }, __is_vector, + __is_parallel); }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_default_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - return internal::__invoke_if_else(std::is_trivial<_ValueType>(), [&]() { return std::next(__first, __n); }, - [&]() { - return internal::__pattern_walk1_n( - std::forward<_ExecutionPolicy>(__exec), __first, __n, - [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; }, - __is_vector, __is_parallel); - }); + return __internal::__invoke_if_else(std::is_trivial<_ValueType>(), [&]() { return std::next(__first, __n); }, + [&]() { + return __internal::__pattern_walk1_n( + std::forward<_ExecutionPolicy>(__exec), __first, __n, + [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType; }, + __is_vector, __is_parallel); + }); } // [uninitialized.construct.value] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, void> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, void> uninitialized_value_construct(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - internal::__invoke_if_else( + __internal::__invoke_if_else( std::is_trivial<_ValueType>(), [&]() { - internal::__pattern_walk_brick(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [__is_vector](_ForwardIterator __begin, _ForwardIterator __end) { - internal::__brick_fill(__begin, __end, _ValueType(), __is_vector); - }, - __is_parallel); + __internal::__pattern_walk_brick(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [__is_vector](_ForwardIterator __begin, _ForwardIterator __end) { + __internal::__brick_fill(__begin, __end, _ValueType(), __is_vector); + }, + __is_parallel); }, [&]() { - internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, - [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(); }, - __is_vector, __is_parallel); + __internal::__pattern_walk1(std::forward<_ExecutionPolicy>(__exec), __first, __last, + [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(); }, + __is_vector, __is_parallel); }); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator> uninitialized_value_construct_n(_ExecutionPolicy&& __exec, _ForwardIterator __first, _Size __n) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; typedef typename iterator_traits<_ForwardIterator>::reference _ReferenceType; using namespace __pstl; - const auto __is_parallel = internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - const auto __is_vector = internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_parallel = __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); + const auto __is_vector = __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec); - return internal::__invoke_if_else( + return __internal::__invoke_if_else( std::is_trivial<_ValueType>(), [&]() { - return internal::__pattern_walk_brick_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, - [__is_vector](_ForwardIterator __begin, _Size __count) { - return internal::__brick_fill_n(__begin, __count, _ValueType(), - __is_vector); - }, - __is_parallel); + return __internal::__pattern_walk_brick_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, + [__is_vector](_ForwardIterator __begin, _Size __count) { + return __internal::__brick_fill_n(__begin, __count, + _ValueType(), __is_vector); + }, + __is_parallel); }, [&]() { - return internal::__pattern_walk1_n(std::forward<_ExecutionPolicy>(__exec), __first, __n, - [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(); }, - __is_vector, __is_parallel); + return __internal::__pattern_walk1_n( + std::forward<_ExecutionPolicy>(__exec), __first, __n, + [](_ReferenceType __val) { ::new (std::addressof(__val)) _ValueType(); }, __is_vector, __is_parallel); }); } Index: include/pstl/internal/glue_numeric_defs.h =================================================================== --- include/pstl/internal/glue_numeric_defs.h +++ include/pstl/internal/glue_numeric_defs.h @@ -17,39 +17,40 @@ // [reduce] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __binary_op); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, typename iterator_traits<_ForwardIterator>::value_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::value_type> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Tp __init); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __binary_op, _UnaryOperation __unary_op); // [exclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Tp __init); @@ -61,17 +62,17 @@ // [inclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _Tp __init); @@ -79,7 +80,7 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op, _UnaryOperation __unary_op); @@ -88,26 +89,26 @@ template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _UnaryOperation __unary_op, _Tp __init); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _UnaryOperation __unary_op); // [adjacent.difference] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first, _BinaryOperation op); template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first); Index: include/pstl/internal/glue_numeric_impl.h =================================================================== --- include/pstl/internal/glue_numeric_impl.h +++ include/pstl/internal/glue_numeric_impl.h @@ -21,81 +21,82 @@ // [reduce] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __binary_op) { return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, __init, __binary_op, - __pstl::internal::__no_op()); + __pstl::__internal::__no_op()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init) { return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, __init, std::plus<_Tp>(), - __pstl::internal::__no_op()); + __pstl::__internal::__no_op()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, typename iterator_traits<_ForwardIterator>::value_type> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, + typename iterator_traits<_ForwardIterator>::value_type> reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last) { typedef typename iterator_traits<_ForwardIterator>::value_type _ValueType; return transform_reduce(std::forward<_ExecutionPolicy>(__exec), __first, __last, _ValueType{}, - std::plus<_ValueType>(), __pstl::internal::__no_op()); + std::plus<_ValueType>(), __pstl::__internal::__no_op()); } // [transform.reduce] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Tp __init) { typedef typename iterator_traits<_ForwardIterator1>::value_type _InputType; using namespace __pstl; - return internal::__pattern_transform_reduce( + return __internal::__pattern_transform_reduce( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __init, std::plus<_InputType>(), std::multiplies<_InputType>(), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2) { using namespace __pstl; - return internal::__pattern_transform_reduce( + return __internal::__pattern_transform_reduce( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, __first2, __init, __binary_op1, __binary_op2, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _Tp> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp> transform_reduce(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Tp __init, _BinaryOperation __binary_op, _UnaryOperation __unary_op) { using namespace __pstl; - return internal::__pattern_transform_reduce( + return __internal::__pattern_transform_reduce( std::forward<_ExecutionPolicy>(__exec), __first, __last, __init, __binary_op, __unary_op, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator>(__exec)); } // [exclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Tp __init) { return transform_exclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __init, - std::plus<_Tp>(), __pstl::internal::__no_op()); + std::plus<_Tp>(), __pstl::__internal::__no_op()); } template @@ -104,76 +105,76 @@ _ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op) { return transform_exclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __init, - __binary_op, __pstl::internal::__no_op()); + __binary_op, __pstl::__internal::__no_op()); } // [inclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result) { typedef typename iterator_traits<_ForwardIterator1>::value_type _InputType; return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, - std::plus<_InputType>(), __pstl::internal::__no_op()); + std::plus<_InputType>(), __pstl::__internal::__no_op()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op) { return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __binary_op, - __pstl::internal::__no_op()); + __pstl::__internal::__no_op()); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _Tp __init) { return transform_inclusive_scan(std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __binary_op, - __pstl::internal::__no_op(), __init); + __pstl::__internal::__no_op(), __init); } // [transform.exclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_exclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _Tp __init, _BinaryOperation __binary_op, _UnaryOperation __unary_op) { using namespace __pstl; - return internal::__pattern_transform_scan( + return __internal::__pattern_transform_scan( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __unary_op, __init, __binary_op, /*inclusive=*/std::false_type(), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } // [transform.inclusive.scan] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _UnaryOperation __unary_op, _Tp __init) { using namespace __pstl; - return internal::__pattern_transform_scan( + return __internal::__pattern_transform_scan( std::forward<_ExecutionPolicy>(__exec), __first, __last, __result, __unary_op, __init, __binary_op, /*inclusive=*/std::true_type(), - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> transform_inclusive_scan(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __result, _BinaryOperation __binary_op, _UnaryOperation __unary_op) { @@ -193,7 +194,7 @@ // [adjacent.difference] template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first, _BinaryOperation __op) { @@ -202,14 +203,14 @@ return __d_first; using namespace __pstl; - return internal::__pattern_adjacent_difference( + return __internal::__pattern_adjacent_difference( std::forward<_ExecutionPolicy>(__exec), __first, __last, __d_first, __op, - internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), - internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); + __internal::__is_vectorization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec), + __internal::__is_parallelization_preferred<_ExecutionPolicy, _ForwardIterator1, _ForwardIterator2>(__exec)); } template -__pstl::internal::enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> +__pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator2> adjacent_difference(_ExecutionPolicy&& __exec, _ForwardIterator1 __first, _ForwardIterator1 __last, _ForwardIterator2 __d_first) { Index: include/pstl/internal/memory_impl.h =================================================================== --- include/pstl/internal/memory_impl.h +++ include/pstl/internal/memory_impl.h @@ -16,7 +16,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -26,7 +26,7 @@ template _OutputIterator __brick_uninitialized_move(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, - /*vector=*/std::false_type) noexcept + /*vector=*/std::false_type) noexcept { typedef typename std::iterator_traits<_OutputIterator>::value_type _ValueType2; for (; __first != __last; ++__first, ++__result) @@ -39,7 +39,7 @@ template _OutputIterator __brick_uninitialized_move(_ForwardIterator __first, _ForwardIterator __last, _OutputIterator __result, - /*vector=*/std::true_type) noexcept + /*vector=*/std::true_type) noexcept { typedef typename std::iterator_traits<_OutputIterator>::value_type __ValueType2; typedef typename std::iterator_traits<_ForwardIterator>::reference _ReferenceType1; @@ -50,7 +50,7 @@ [](_ReferenceType1 __x, _ReferenceType2 __y) { ::new (std::addressof(__y)) __ValueType2(std::move(__x)); }); } -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_memory_impl_H */ Index: include/pstl/internal/numeric_fwd.h =================================================================== --- include/pstl/internal/numeric_fwd.h +++ include/pstl/internal/numeric_fwd.h @@ -15,7 +15,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -141,6 +141,6 @@ _IsVector, /*is_parallel*/ std::true_type); #endif -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_numeric_fwd_H */ Index: include/pstl/internal/numeric_impl.h =================================================================== --- include/pstl/internal/numeric_impl.h +++ include/pstl/internal/numeric_impl.h @@ -24,7 +24,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -71,7 +71,7 @@ _RandomAccessIterator2 __first2, _Tp __init, _BinaryOperation1 __binary_op1, _BinaryOperation2 __binary_op2, _IsVector __is_vector, /*is_parallel=*/std::true_type) { - return internal::__except_handler([&]() { + return __except_handler([&]() { return __par_backend::__parallel_transform_reduce( std::forward<_ExecutionPolicy>(__exec), __first1, __last1, [__first1, __first2, __binary_op2](_RandomAccessIterator1 __i) mutable { @@ -81,8 +81,8 @@ __binary_op1, // Combine [__first1, __first2, __binary_op1, __binary_op2, __is_vector](_RandomAccessIterator1 __i, _RandomAccessIterator1 __j, _Tp __init) -> _Tp { - return internal::__brick_transform_reduce(__i, __j, __first2 + (__i - __first1), __init, __binary_op1, - __binary_op2, __is_vector); + return __brick_transform_reduce(__i, __j, __first2 + (__i - __first1), __init, __binary_op1, + __binary_op2, __is_vector); }); }); } @@ -223,8 +223,7 @@ _OutputIterator __result, _UnaryOperation __unary_op, _Tp __init, _BinaryOperation __binary_op, _Inclusive, _IsVector __is_vector, /*is_parallel=*/std::false_type) noexcept { - return internal::__brick_transform_scan(__first, __last, __result, __unary_op, __init, __binary_op, _Inclusive(), - __is_vector) + return __brick_transform_scan(__first, __last, __result, __unary_op, __init, __binary_op, _Inclusive(), __is_vector) .first; } @@ -238,20 +237,20 @@ { typedef typename std::iterator_traits<_RandomAccessIterator>::difference_type _DifferenceType; - return internal::__except_handler([&]() { + return __except_handler([&]() { __par_backend::__parallel_transform_scan( std::forward<_ExecutionPolicy>(__exec), __last - __first, [__first, __unary_op](_DifferenceType __i) mutable { return __unary_op(__first[__i]); }, __init, __binary_op, [__first, __unary_op, __binary_op](_DifferenceType __i, _DifferenceType __j, _Tp __init) { // Execute serial __brick_transform_reduce, due to the explicit SIMD vectorization (reduction) requires a commutative operation for the guarantee of correct scan. - return internal::__brick_transform_reduce(__first + __i, __first + __j, __init, __binary_op, __unary_op, - /*__is_vector*/ std::false_type()); + return __brick_transform_reduce(__first + __i, __first + __j, __init, __binary_op, __unary_op, + /*__is_vector*/ std::false_type()); }, [__first, __unary_op, __binary_op, __result, __is_vector](_DifferenceType __i, _DifferenceType __j, _Tp __init) { - return internal::__brick_transform_scan(__first + __i, __first + __j, __result + __i, __unary_op, - __init, __binary_op, _Inclusive(), __is_vector) + return __brick_transform_scan(__first + __i, __first + __j, __result + __i, __unary_op, __init, + __binary_op, _Inclusive(), __is_vector) .second; }); return __result + (__last - __first); @@ -333,7 +332,7 @@ _OutputIterator __d_first, _BinaryOperation __op, _IsVector __is_vector, /*is_parallel*/ std::false_type) noexcept { - return internal::__brick_adjacent_difference(__first, __last, __d_first, __op, __is_vector); + return __brick_adjacent_difference(__first, __last, __d_first, __op, __is_vector); } #if __PSTL_USE_PAR_POLICIES @@ -362,7 +361,7 @@ } #endif -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_numeric_impl_H */ Index: include/pstl/internal/parallel_impl.h =================================================================== --- include/pstl/internal/parallel_impl.h +++ include/pstl/internal/parallel_impl.h @@ -16,7 +16,7 @@ namespace __pstl { -namespace internal +namespace __internal { //------------------------------------------------------------------------ @@ -75,7 +75,7 @@ return __found; } -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_parallel_impl_H */ Index: include/pstl/internal/unseq_backend_simd.h =================================================================== --- include/pstl/internal/unseq_backend_simd.h +++ include/pstl/internal/unseq_backend_simd.h @@ -796,7 +796,7 @@ for (; __first != __last; ++__first) { if (simd_or(__s_first, __n2, - internal::__equal_value_by_pred(*__first, __pred))) + __internal::__equal_value_by_pred(*__first, __pred))) { return __first; } Index: include/pstl/internal/utils.h =================================================================== --- include/pstl/internal/utils.h +++ include/pstl/internal/utils.h @@ -15,7 +15,7 @@ namespace __pstl { -namespace internal +namespace __internal { template @@ -216,7 +216,7 @@ } } -} // namespace internal +} // namespace __internal } // namespace __pstl #endif /* __PSTL_utils_H */ Index: test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp =================================================================== --- test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp +++ test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp @@ -39,7 +39,7 @@ EXPECT_TRUE(std::distance(true_first, actual_ret.first) == std::count_if(first, last, unary_op), "partition_copy has wrong effect from true sequence"); EXPECT_TRUE(std::distance(false_first, actual_ret.second) == - std::count_if(first, last, __pstl::internal::__not_pred(unary_op)), + std::count_if(first, last, __pstl::__internal::__not_pred(unary_op)), "partition_copy has wrong effect from false sequence"); } Index: test/std/algorithms/alg.modifying.operations/replace.pass.cpp =================================================================== --- test/std/algorithms/alg.modifying.operations/replace.pass.cpp +++ test/std/algorithms/alg.modifying.operations/replace.pass.cpp @@ -151,7 +151,7 @@ int32_t main() { - test(__pstl::internal::__equal_value(666)); + test(__pstl::__internal::__equal_value(666)); test([](const uint16_t& elem) { return elem % 3 < 2; }); test([](const float64_t& elem) { return elem * elem - 3.5 * elem > 10; }); test([](const copy_int& val) { return val.value / 5 > 2; }); Index: test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp +++ test/std/algorithms/alg.sorting/alg.set.operations/includes.pass.cpp @@ -103,7 +103,7 @@ main() { - test_includes(__pstl::internal::__pstl_less()); + test_includes(__pstl::__internal::__pstl_less()); test_includes, Num>([](const Num& x, const Num& y) { return x < y; }); std::cout << done() << std::endl; Index: test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp =================================================================== --- test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp +++ test/std/algorithms/alg.sorting/alg.set.operations/set.pass.cpp @@ -156,7 +156,7 @@ main() { - test_set(__pstl::internal::__pstl_less()); + test_set(__pstl::__internal::__pstl_less()); test_set, Num>([](const Num& x, const Num& y) { return x < y; }); test_algo_basic_double(run_for_rnd_fw>()); Index: test/support/utils.h =================================================================== --- test/support/utils.h +++ test/support/utils.h @@ -1239,7 +1239,7 @@ invoke_if(Policy&& p, F f) { #if __PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || __PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN - __pstl::internal::invoke_if_not(__pstl::internal::allow_unsequenced(), f); + __pstl::__internal::invoke_if_not(__pstl::__internal::allow_unsequenced(), f); #else f(); #endif