This is an archive of the discontinued LLVM Phabricator instance.

Differential D27024

[libcxx] [test] Fix MSVC warning C4389 "signed/unsigned mismatch", part 11/12.
ClosedPublic

Authored by STL_MSFT on Nov 22 2016, 4:55 PM.

Details

Reviewers
mclow.lists
EricWF
Summary

[libcxx] [test] Fix MSVC warning C4389 "signed/unsigned mismatch", part 11/12.

Change "unsigned n = 0;" to "int n = 0;". It's being compared to int elements and ptrdiff_t distances.

test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp
This one's a little special, but not really. "*i == n" is comparing MoveOnly to n.
MoveOnly is implicitly constructible from int, so int is the correct type to use here.

Diff Detail

Event Timeline

STL_MSFT updated this revision to Diff 78994.Nov 22 2016, 4:55 PM
STL_MSFT retitled this revision from to [libcxx] [test] Fix MSVC warning C4389 "signed/unsigned mismatch", part 11/12..
STL_MSFT updated this object.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.
Herald edited edge metadata. · View Herald TranscriptNov 22 2016, 4:55 PM
EricWF accepted this revision.Dec 2 2016, 11:39 PM
EricWF edited edge metadata.
This revision is now accepted and ready to land.Dec 2 2016, 11:39 PM
STL_MSFT mentioned this in rL288748: [libcxx] [test] D27024: Fix MSVC warning C4389 "signed/unsigned mismatch", part….Dec 5 2016, 5:24 PM
STL_MSFT closed this revision.Dec 5 2016, 5:27 PM

Thanks, r288748.

Revision Contents

PathSize
test/
std/
containers/
sequences/
forwardlist/
forwardlist.cons/
6 lines
6 lines
4 lines
4 lines
6 lines
4 lines
4 lines

Diff 78994

test/std/containers/sequences/forwardlist/forwardlist.cons/copy.pass.cpp

Show All 22 Lines
{ {
{ {
typedef int T; typedef int T;
typedef test_allocator<int> A; typedef test_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A(10)); C c0(std::begin(t), std::end(t), A(10));
C c = c0; C c = c0;
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A(10)); assert(c.get_allocator() == A(10));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef other_allocator<int> A; typedef other_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A(10)); C c0(std::begin(t), std::end(t), A(10));
C c = c0; C c = c0;
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A(-2)); assert(c.get_allocator() == A(-2));
} }
{ {
typedef int T; typedef int T;
typedef min_allocator<int> A; typedef min_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A()); C c0(std::begin(t), std::end(t), A());
C c = c0; C c = c0;
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
} }
#endif #endif
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/copy_alloc.pass.cpp

Show All 21 Lines
{ {
{ {
typedef int T; typedef int T;
typedef test_allocator<int> A; typedef test_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A(10)); C c0(std::begin(t), std::end(t), A(10));
C c(c0, A(9)); C c(c0, A(9));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A(9)); assert(c.get_allocator() == A(9));
} }
{ {
typedef int T; typedef int T;
typedef other_allocator<int> A; typedef other_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A(10)); C c0(std::begin(t), std::end(t), A(10));
C c(c0, A(9)); C c(c0, A(9));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A(9)); assert(c.get_allocator() == A(9));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef min_allocator<int> A; typedef min_allocator<int> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c0(std::begin(t), std::end(t), A()); C c0(std::begin(t), std::end(t), A());
C c(c0, A()); C c(c0, A());
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c == c0); assert(c == c0);
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
} }
#endif #endif
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/init.pass.cpp

Show All 17 Lines
int main() int main()
{ {
#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
{ {
typedef int T; typedef int T;
typedef std::forward_list<T> C; typedef std::forward_list<T> C;
C c = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; C c = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == 10); assert(n == 10);
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef std::forward_list<T, min_allocator<T>> C; typedef std::forward_list<T, min_allocator<T>> C;
C c = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; C c = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == 10); assert(n == 10);
} }
#endif #endif
#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/init_alloc.pass.cpp

Show All 19 Lines
int main() int main()
{ {
#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
{ {
typedef int T; typedef int T;
typedef test_allocator<T> A; typedef test_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
C c({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, A(14)); C c({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, A(14));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == 10); assert(n == 10);
assert(c.get_allocator() == A(14)); assert(c.get_allocator() == A(14));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef min_allocator<T> A; typedef min_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
C c({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, A()); C c({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, A());
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == 10); assert(n == 10);
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
} }
#endif #endif
#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS #endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/move.pass.cpp

Show All 24 Lines#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{ {
typedef MoveOnly T; typedef MoveOnly T;
typedef test_allocator<T> A; typedef test_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
typedef std::move_iterator<T*> I; typedef std::move_iterator<T*> I;
C c0(I(std::begin(t)), I(std::end(t)), A(10)); C c0(I(std::begin(t)), I(std::end(t)), A(10));
C c = std::move(c0); C c = std::move(c0);
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c0.empty()); assert(c0.empty());
assert(c.get_allocator() == A(10)); assert(c.get_allocator() == A(10));
} }
{ {
typedef MoveOnly T; typedef MoveOnly T;
typedef other_allocator<T> A; typedef other_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
typedef std::move_iterator<T*> I; typedef std::move_iterator<T*> I;
C c0(I(std::begin(t)), I(std::end(t)), A(10)); C c0(I(std::begin(t)), I(std::end(t)), A(10));
C c = std::move(c0); C c = std::move(c0);
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c0.empty()); assert(c0.empty());
assert(c.get_allocator() == A(10)); assert(c.get_allocator() == A(10));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef MoveOnly T; typedef MoveOnly T;
typedef min_allocator<T> A; typedef min_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
typedef std::move_iterator<T*> I; typedef std::move_iterator<T*> I;
C c0(I(std::begin(t)), I(std::end(t)), A()); C c0(I(std::begin(t)), I(std::end(t)), A());
C c = std::move(c0); C c = std::move(c0);
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c0.empty()); assert(c0.empty());
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
} }
#endif #endif
#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/range.pass.cpp

Show All 21 Lines
int main() int main()
{ {
{ {
typedef int T; typedef int T;
typedef std::forward_list<T> C; typedef std::forward_list<T> C;
typedef input_iterator<const T*> I; typedef input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t))); C c(I(std::begin(t)), I(std::end(t)));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef std::forward_list<T, min_allocator<T>> C; typedef std::forward_list<T, min_allocator<T>> C;
typedef input_iterator<const T*> I; typedef input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t))); C c(I(std::begin(t)), I(std::end(t)));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
} }
#endif #endif
} }

test/std/containers/sequences/forwardlist/forwardlist.cons/range_alloc.pass.cpp

Show All 24 Lines
{ {
{ {
typedef int T; typedef int T;
typedef test_allocator<T> A; typedef test_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
typedef input_iterator<const T*> I; typedef input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)), A(13)); C c(I(std::begin(t)), I(std::end(t)), A(13));
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c.get_allocator() == A(13)); assert(c.get_allocator() == A(13));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef int T; typedef int T;
typedef min_allocator<T> A; typedef min_allocator<T> A;
typedef std::forward_list<T, A> C; typedef std::forward_list<T, A> C;
typedef input_iterator<const T*> I; typedef input_iterator<const T*> I;
const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; const T t[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
C c(I(std::begin(t)), I(std::end(t)), A()); C c(I(std::begin(t)), I(std::end(t)), A());
unsigned n = 0; int n = 0;
for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n) for (C::const_iterator i = c.begin(), e = c.end(); i != e; ++i, ++n)
assert(*i == n); assert(*i == n);
assert(n == std::end(t) - std::begin(t)); assert(n == std::end(t) - std::begin(t));
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
} }
#endif #endif
} }