From afe99ae092b92f88c93dbf4b139557e998d938be Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Wed, 23 Nov 2016 22:02:16 +0000 Subject: [PATCH] [libcxx] [test] D27015: Fix MSVC warning C4018 "signed/unsigned mismatch", part 3/12. Change unsigned to int in parameters. llvm-svn: 287823 --- .../alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp | 2 +- .../alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp | 2 +- .../test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp | 2 +- .../std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp | 2 +- .../test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp | 2 +- .../std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp | 2 +- .../std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp | 2 +- .../algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp | 2 +- .../std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp | 4 ++-- .../algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp | 4 ++-- .../alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp | 4 ++-- .../alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp | 4 ++-- .../alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp | 4 ++-- .../alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp | 4 ++-- libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp | 4 ++-- .../algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp | 4 ++-- 21 files changed, 29 insertions(+), 29 deletions(-) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp index 51b9127..9da9356 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/make_heap.pass.cpp @@ -17,7 +17,7 @@ #include #include -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp index 823985d..252fc75 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap.pass.cpp @@ -17,7 +17,7 @@ #include #include -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp index 1db4428..0bfad61 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/pop_heap_comp.pass.cpp @@ -29,7 +29,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp index 0fc50a8..d82896d 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap.pass.cpp @@ -18,7 +18,7 @@ #include #include -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp index 217217b..5d2985c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/push_heap_comp.pass.cpp @@ -30,7 +30,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp index 4a08f11..c6eaa8c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap.pass.cpp @@ -17,7 +17,7 @@ #include #include -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp index 7d3e2d5..1c072c5 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/sort_heap_comp.pass.cpp @@ -29,7 +29,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES -void test(unsigned N) +void test(int N) { int* ia = new int [N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp index 3ecc250..e9cd086 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element.pass.cpp @@ -35,7 +35,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp index fc88268..2e8e0c3 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/max_element_comp.pass.cpp @@ -36,7 +36,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp index 45dd54b..c418842 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element.pass.cpp @@ -35,7 +35,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp index 94ef482..0f5c80c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/min_element_comp.pass.cpp @@ -36,7 +36,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp index ef54740..fc97778 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element.pass.cpp @@ -41,7 +41,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp index 3a0c2db..a39512f 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/minmax_element_comp.pass.cpp @@ -44,7 +44,7 @@ test(Iter first, Iter last) template void -test(unsigned N) +test(int N) { int* a = new int[N]; for (int i = 0; i < N; ++i) diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp index dc5564e..560bc90 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element.pass.cpp @@ -19,7 +19,7 @@ #include void -test_one(unsigned N, unsigned M) +test_one(int N, int M) { assert(N != 0); assert(M < N); @@ -34,7 +34,7 @@ test_one(unsigned N, unsigned M) } void -test(unsigned N) +test(int N) { test_one(N, 0); test_one(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp index 49343ed..fd5b701 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp @@ -33,7 +33,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void -test_one(unsigned N, unsigned M) +test_one(int N, int M) { assert(N != 0); assert(M < N); @@ -48,7 +48,7 @@ test_one(unsigned N, unsigned M) } void -test(unsigned N) +test(int N) { test_one(N, 0); test_one(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp index 5f298fd..1d4ca99 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy.pass.cpp @@ -24,7 +24,7 @@ template void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { int* input = new int[N]; int* output = new int[M]; @@ -43,7 +43,7 @@ test_larger_sorts(unsigned N, unsigned M) template void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 0); test_larger_sorts(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp index df8fb9ea..460ea4c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/partial_sort_copy_comp.pass.cpp @@ -27,7 +27,7 @@ template void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { int* input = new int[N]; int* output = new int[M]; @@ -47,7 +47,7 @@ test_larger_sorts(unsigned N, unsigned M) template void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 0); test_larger_sorts(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp index 62458ec..0d32ba8 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort.pass.cpp @@ -19,7 +19,7 @@ #include void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { assert(N != 0); assert(N >= M); @@ -37,7 +37,7 @@ test_larger_sorts(unsigned N, unsigned M) } void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 0); test_larger_sorts(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp index d7981e6..a4fe1cc 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/partial_sort_comp.pass.cpp @@ -33,7 +33,7 @@ struct indirect_less #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { assert(N != 0); assert(N >= M); @@ -51,7 +51,7 @@ test_larger_sorts(unsigned N, unsigned M) } void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 0); test_larger_sorts(N, 1); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp index 2ea697a..ebb8767 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/sort.pass.cpp @@ -72,7 +72,7 @@ test_sort_() } void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { assert(N != 0); assert(M != 0); @@ -112,7 +112,7 @@ test_larger_sorts(unsigned N, unsigned M) } void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 1); test_larger_sorts(N, 2); diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp index 5faa1682..2721c9c 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/stable_sort.pass.cpp @@ -72,7 +72,7 @@ test_sort_() } void -test_larger_sorts(unsigned N, unsigned M) +test_larger_sorts(int N, int M) { assert(N != 0); assert(M != 0); @@ -112,7 +112,7 @@ test_larger_sorts(unsigned N, unsigned M) } void -test_larger_sorts(unsigned N) +test_larger_sorts(int N) { test_larger_sorts(N, 1); test_larger_sorts(N, 2); -- 2.7.4