diff options
Diffstat (limited to 'pstl/test/std/algorithms/alg.merge')
-rw-r--r-- | pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp | 6 | ||||
-rw-r--r-- | pstl/test/std/algorithms/alg.merge/merge.pass.cpp | 2 |
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 7a8d065..9efe8f8 100644 --- a/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/inplace_merge.pass.cpp @@ -42,8 +42,6 @@ struct test_one_policy operator()(Policy&& exec, BiDirIt1 first1, BiDirIt1 last1, BiDirIt1 first2, BiDirIt1 last2, Size n, Size m, Generator1 generator1, Generator2 generator2, Compare comp) { - - using T = typename std::iterator_traits<BiDirIt1>::value_type; const BiDirIt1 mid1 = std::next(first1, m); fill_data(first1, mid1, generator1); fill_data(mid1, last1, generator2); @@ -60,8 +58,8 @@ 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&& exec, BiDirIt1 first1, BiDirIt1 last1, BiDirIt1 first2, BiDirIt1 last2, Size n, Size m, - Generator1 generator1, Generator2 generator2, Compare comp) + 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 b215beb..5912775 100644 --- a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp +++ b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp @@ -47,7 +47,7 @@ struct test_merge 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 comp) + Compare) { using namespace std; typedef typename std::iterator_traits<std::reverse_iterator<InputIterator1>>::value_type T; |