From e9c728899f2b0f59b17c11ac146f16483a521c59 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Tue, 6 Dec 2016 01:13:51 +0000 Subject: [libcxx] [test] D27025: Fix MSVC warning C4389 "signed/unsigned mismatch", part 12/12. Various changes: test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp This is comparing value_type to unsigned. value_type is sometimes int and sometimes struct S (implicitly constructible from int). static_cast(unsigned) silences the warning and doesn't do anything bad (as the values in question are small). test/std/algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp This is comparing an int remote-element to size_t. The values in question are small and non-negative, so either type is fine. I think that converting int to size_t is marginally better here than the reverse. test/std/containers/sequences/deque/deque.cons/size.pass.cpp DefaultOnly::count is int (and non-negative). When comparing to unsigned, use static_cast. test/std/strings/basic.string/string.access/index.pass.cpp We're comparing char to '0' through '9', but formed with the type size_t. Add static_cast. test/std/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp Include for pedantic correctness (this test was already mentioning std::size_t). "v[i] == (i & 1)" was comparing bool to size_t. Saying "v[i] == ((i & 1) != 0)" smashes the RHS to bool. llvm-svn: 288749 --- libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp | 2 +- .../algorithms/alg.sorting/alg.nth.element/nth_element_comp.pass.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libcxx/test/std/algorithms/alg.sorting') diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp index 9c411730196..33a42a2f62a 100644 --- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp +++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/inplace_merge.pass.cpp @@ -58,7 +58,7 @@ test_one(unsigned N, unsigned M) if(N > 0) { assert(ia[0] == 0); - assert(ia[N-1] == N-1); + assert(ia[N-1] == static_cast(N-1)); assert(std::is_sorted(ia, ia+N)); } delete [] ia; 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 fd5b7012d52..f2c962724f0 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 @@ -81,7 +81,7 @@ int main() for (int i = 0; static_cast(i) < v.size(); ++i) v[i].reset(new int(i)); std::nth_element(v.begin(), v.begin() + v.size()/2, v.end(), indirect_less()); - assert(*v[v.size()/2] == v.size()/2); + assert(static_cast(*v[v.size()/2]) == v.size()/2); } #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES } -- cgit v1.2.3