diff options
| author | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:13:29 +0000 |
|---|---|---|
| committer | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:13:29 +0000 |
| commit | e17a155c618765c423cbb66ab010ee616aeb72b3 (patch) | |
| tree | 0a8675cbd4409a4a85d71e1fb4007a31f5be0194 /libcxx/test/std/algorithms/alg.sorting | |
| parent | 68a694b800a9bb5f5cbbc5d8c956a87273356d20 (diff) | |
| download | bcm5719-llvm-e17a155c618765c423cbb66ab010ee616aeb72b3.tar.gz bcm5719-llvm-e17a155c618765c423cbb66ab010ee616aeb72b3.zip | |
[libcxx] [test] D27023: Fix MSVC warning C4389 "signed/unsigned mismatch", part 10/12.
Add static_cast<int>. In these cases, the values are guaranteed to be small-ish,
and they're being compared to int elements.
test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
Use int instead of unsigned to iterate from 0 to 10.
llvm-svn: 288747
Diffstat (limited to 'libcxx/test/std/algorithms/alg.sorting')
| -rw-r--r-- | libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp index de96c419c4e..2a20cac0b79 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge.pass.cpp @@ -40,7 +40,7 @@ test() InIter2(ib), InIter2(ib+N), OutIter(ic)); assert(base(r) == ic+2*N); assert(ic[0] == 0); - assert(ic[2*N-1] == 2*N-1); + assert(ic[2*N-1] == static_cast<int>(2*N-1)); assert(std::is_sorted(ic, ic+2*N)); delete [] ic; delete [] ib; @@ -62,7 +62,7 @@ test() InIter2(ib), InIter2(ib+N), OutIter(ic)); assert(base(r) == ic+2*N); assert(ic[0] == 0); - assert(ic[2*N-1] == 2*N-1); + assert(ic[2*N-1] == static_cast<int>(2*N-1)); assert(std::is_sorted(ic, ic+2*N)); delete [] ic; delete [] ib; diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp index bd38d7de689..152c552381b 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/merge_comp.pass.cpp @@ -46,7 +46,7 @@ test() OutIter r = std::merge(InIter1(ia), InIter1(ia+N), InIter2(ib), InIter2(ib+N), OutIter(ic), pred); assert(base(r) == ic+2*N); - assert(ic[0] == 2*N-1); + assert(ic[0] == static_cast<int>(2*N-1)); assert(ic[2*N-1] == 0); assert(std::is_sorted(ic, ic+2*N, std::greater<int>())); assert(pred.count() <= (N + N - 1)); @@ -70,7 +70,7 @@ test() OutIter r = std::merge(InIter1(ia), InIter1(ia+N), InIter2(ib), InIter2(ib+N), OutIter(ic), pred); assert(base(r) == ic+2*N); - assert(ic[0] == 2*N-1); + assert(ic[0] == static_cast<int>(2*N-1)); assert(ic[2*N-1] == 0); assert(std::is_sorted(ic, ic+2*N, std::greater<int>())); assert(pred.count() <= (N + N - 1)); |
