diff options
Diffstat (limited to 'pstl/test/std/algorithms/alg.merge')
| -rw-r--r-- | pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp | 5 | ||||
| -rw-r--r-- | pstl/test/std/algorithms/alg.merge/merge.pass.cpp | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp index 64433c835ed..74ecc0c5a70 100644 --- a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp @@ -20,7 +20,7 @@ using namespace TestUtils; struct test_one_policy { -#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ +#if _PSTL_ICC_17_VC141_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN || \ _PSTL_ICC_16_VC14_TEST_SIMD_LAMBDA_DEBUG_32_BROKEN // dummy specialization by policy type, in case of broken configuration template <typename BiDirIt1, typename Size, typename Generator1, typename Generator2, typename Compare> void @@ -60,8 +60,7 @@ struct test_one_policy template <typename Policy, typename BiDirIt1, typename Size, typename Generator1, typename Generator2, typename Compare> typename std::enable_if<is_same_iterator_category<BiDirIt1, std::forward_iterator_tag>::value, void>::type - operator()(Policy&&, BiDirIt1, BiDirIt1, BiDirIt1, BiDirIt1, Size, Size, - Generator1, Generator2, Compare) + operator()(Policy&&, BiDirIt1, BiDirIt1, BiDirIt1, BiDirIt1, Size, Size, Generator1, Generator2, Compare) { } }; diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp index 56b557cca74..d2381036cda 100644 --- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp @@ -48,8 +48,7 @@ struct test_merge void operator()(Policy&& exec, std::reverse_iterator<InputIterator1> first1, std::reverse_iterator<InputIterator1> last1, std::reverse_iterator<InputIterator2> first2, std::reverse_iterator<InputIterator2> last2, - std::reverse_iterator<OutputIterator> out_first, std::reverse_iterator<OutputIterator> out_last, - Compare) + std::reverse_iterator<OutputIterator> out_first, std::reverse_iterator<OutputIterator> out_last, Compare) { using namespace std; typedef typename std::iterator_traits<std::reverse_iterator<InputIterator1>>::value_type T; |
