[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. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@288747 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -53,7 +53,7 @@ test1()
|
|||||||
OutIter r = std::move(InIter(ia), InIter(ia+N), OutIter(ib));
|
OutIter r = std::move(InIter(ia), InIter(ia+N), OutIter(ib));
|
||||||
assert(base(r) == ib+N);
|
assert(base(r) == ib+N);
|
||||||
for (unsigned i = 0; i < N; ++i)
|
for (unsigned i = 0; i < N; ++i)
|
||||||
assert(*ib[i] == i);
|
assert(*ib[i] == static_cast<int>(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ test1()
|
|||||||
OutIter r = std::move_backward(InIter(ia), InIter(ia+N), OutIter(ib+N));
|
OutIter r = std::move_backward(InIter(ia), InIter(ia+N), OutIter(ib+N));
|
||||||
assert(base(r) == ib);
|
assert(base(r) == ib);
|
||||||
for (unsigned i = 0; i < N; ++i)
|
for (unsigned i = 0; i < N; ++i)
|
||||||
assert(*ib[i] == i);
|
assert(*ib[i] == static_cast<int>(i));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
|
||||||
|
|||||||
@@ -35,5 +35,5 @@ int main()
|
|||||||
for_each_test(0));
|
for_each_test(0));
|
||||||
assert(f.count == s);
|
assert(f.count == s);
|
||||||
for (unsigned i = 0; i < s; ++i)
|
for (unsigned i = 0; i < s; ++i)
|
||||||
assert(ia[i] == i+1);
|
assert(ia[i] == static_cast<int>(i+1));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ test()
|
|||||||
InIter2(ib), InIter2(ib+N), OutIter(ic));
|
InIter2(ib), InIter2(ib+N), OutIter(ic));
|
||||||
assert(base(r) == ic+2*N);
|
assert(base(r) == ic+2*N);
|
||||||
assert(ic[0] == 0);
|
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));
|
assert(std::is_sorted(ic, ic+2*N));
|
||||||
delete [] ic;
|
delete [] ic;
|
||||||
delete [] ib;
|
delete [] ib;
|
||||||
@@ -62,7 +62,7 @@ test()
|
|||||||
InIter2(ib), InIter2(ib+N), OutIter(ic));
|
InIter2(ib), InIter2(ib+N), OutIter(ic));
|
||||||
assert(base(r) == ic+2*N);
|
assert(base(r) == ic+2*N);
|
||||||
assert(ic[0] == 0);
|
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));
|
assert(std::is_sorted(ic, ic+2*N));
|
||||||
delete [] ic;
|
delete [] ic;
|
||||||
delete [] ib;
|
delete [] ib;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ test()
|
|||||||
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
|
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
|
||||||
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
|
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
|
||||||
assert(base(r) == ic+2*N);
|
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(ic[2*N-1] == 0);
|
||||||
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
|
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
|
||||||
assert(pred.count() <= (N + N - 1));
|
assert(pred.count() <= (N + N - 1));
|
||||||
@@ -70,7 +70,7 @@ test()
|
|||||||
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
|
OutIter r = std::merge(InIter1(ia), InIter1(ia+N),
|
||||||
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
|
InIter2(ib), InIter2(ib+N), OutIter(ic), pred);
|
||||||
assert(base(r) == ic+2*N);
|
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(ic[2*N-1] == 0);
|
||||||
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
|
assert(std::is_sorted(ic, ic+2*N, std::greater<int>()));
|
||||||
assert(pred.count() <= (N + N - 1));
|
assert(pred.count() <= (N + N - 1));
|
||||||
|
|||||||
@@ -52,18 +52,18 @@ int main()
|
|||||||
{
|
{
|
||||||
{
|
{
|
||||||
std::deque<int> c = make<std::deque<int> >(10);
|
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);
|
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.at(i) == i);
|
||||||
assert(c.front() == 0);
|
assert(c.front() == 0);
|
||||||
assert(c.back() == 9);
|
assert(c.back() == 9);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
const std::deque<int> c = make<std::deque<int> >(10);
|
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);
|
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.at(i) == i);
|
||||||
assert(c.front() == 0);
|
assert(c.front() == 0);
|
||||||
assert(c.back() == 9);
|
assert(c.back() == 9);
|
||||||
@@ -71,18 +71,18 @@ int main()
|
|||||||
#if TEST_STD_VER >= 11
|
#if TEST_STD_VER >= 11
|
||||||
{
|
{
|
||||||
std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
|
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);
|
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.at(i) == i);
|
||||||
assert(c.front() == 0);
|
assert(c.front() == 0);
|
||||||
assert(c.back() == 9);
|
assert(c.back() == 9);
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
const std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
|
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);
|
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.at(i) == i);
|
||||||
assert(c.front() == 0);
|
assert(c.front() == 0);
|
||||||
assert(c.back() == 9);
|
assert(c.back() == 9);
|
||||||
|
|||||||
Reference in New Issue
Block a user