diff options
author | Louis Dionne <ldionne@apple.com> | 2019-06-19 20:15:50 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-06-19 20:15:50 +0000 |
commit | 3491119f9ba466ed871a789eb91e3b7577e36272 (patch) | |
tree | 1afc4af7d6e98ed44edfdd033ac50026bd0b5e74 /pstl/test/std/algorithms/alg.merge/merge.pass.cpp | |
parent | f46f41411b1fa1360fb13235df77e60c8b6e8992 (diff) | |
download | bcm5719-llvm-3491119f9ba466ed871a789eb91e3b7577e36272.tar.gz bcm5719-llvm-3491119f9ba466ed871a789eb91e3b7577e36272.zip |
[pstl] Remove warnings in tests and headers
Mostly unused parameter, unused local typedefs and shadowed declarations.
This massaging it necessary if we want to be able to run the tests under
the libc++ lit configuration.
llvm-svn: 363872
Diffstat (limited to 'pstl/test/std/algorithms/alg.merge/merge.pass.cpp')
-rw-r--r-- | pstl/test/std/algorithms/alg.merge/merge.pass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pstl/test/std/algorithms/alg.merge/merge.pass.cpp b/pstl/test/std/algorithms/alg.merge/merge.pass.cpp index b215beb10af..5912775f9e3 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; |