[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

diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
index 43234be..9a954d9 100644 (file)
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -53,7 +53,7 @@ test1()
     OutIter r = std::move(InIter(ia), InIter(ia+N), OutIter(ib));
     assert(base(r) == ib+N);
     for (unsigned i = 0; i < N; ++i)
-        assert(*ib[i] == i);
+        assert(*ib[i] == static_cast<int>(i));
 }
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES

diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
index 02b6b16..c5f9d3a 100644 (file)
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
@@ -53,7 +53,7 @@ test1()
     OutIter r = std::move_backward(InIter(ia), InIter(ia+N), OutIter(ib+N));
     assert(base(r) == ib);
     for (unsigned i = 0; i < N; ++i)
-        assert(*ib[i] == i);
+        assert(*ib[i] == static_cast<int>(i));
 }
 
 #endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES

diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
index bf80c2c..d6fdd18 100644 (file)
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/test.pass.cpp
@@ -35,5 +35,5 @@ int main()
                                     for_each_test(0));
     assert(f.count == s);
     for (unsigned i = 0; i < s; ++i)
-        assert(ia[i] == i+1);
+        assert(ia[i] == static_cast<int>(i+1));
 }

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 de96c41..2a20cac 100644 (file)
--- 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 bd38d7d..152c552 100644 (file)
--- 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));

diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
index a6a8e74..6f3458a 100644 (file)
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
@@ -52,18 +52,18 @@ int main()
 {
     {
         std::deque<int> c = make<std::deque<int> >(10);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c[i] == i);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c.at(i) == i);
         assert(c.front() == 0);
         assert(c.back() == 9);
     }
     {
         const std::deque<int> c = make<std::deque<int> >(10);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c[i] == i);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c.at(i) == i);
         assert(c.front() == 0);
         assert(c.back() == 9);
@@ -71,18 +71,18 @@ int main()
 #if TEST_STD_VER >= 11
     {
         std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c[i] == i);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c.at(i) == i);
         assert(c.front() == 0);
         assert(c.back() == 9);
     }
     {
         const std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c[i] == i);
-        for (unsigned i = 0; i < 10; ++i)
+        for (int i = 0; i < 10; ++i)
             assert(c.at(i) == i);
         assert(c.front() == 0);
         assert(c.back() == 9);