diff options
author | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-11-23 22:01:58 +0000 |
---|---|---|
committer | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-11-23 22:01:58 +0000 |
commit | a11d322f0d5530a4da67aa77ad1137c63f874288 (patch) | |
tree | ecc89b49e310361b50f4ad9ad064c493d5db0bd7 /libcxx/test/std/containers/sequences | |
parent | eda119345699bcc90befc249388c295d6e611df9 (diff) | |
download | bcm5719-llvm-a11d322f0d5530a4da67aa77ad1137c63f874288.tar.gz bcm5719-llvm-a11d322f0d5530a4da67aa77ad1137c63f874288.zip |
[libcxx] [test] D27014: Fix MSVC warning C4018 "signed/unsigned mismatch", part 2/12.
Add static_cast<std::size_t> when comparing int to std::size_t.
Also, include <cstddef> when it wasn't already being included.
llvm-svn: 287822
Diffstat (limited to 'libcxx/test/std/containers/sequences')
14 files changed, 63 insertions, 51 deletions
diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp index 156c274327e..5c7e855d8b2 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size.pass.cpp @@ -52,7 +52,7 @@ test(C& c1, int size) assert(c1.size() == size); assert(distance(c1.begin(), c1.end()) == c1.size()); CI i = c1.begin(); - for (int j = 0; j < std::min(c1_osize, c1.size()); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < std::min(c1_osize, c1.size()); ++j, ++i) assert(*i == j); for (std::size_t j = c1_osize; j < c1.size(); ++j, ++i) assert(*i == 0); diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp index 82d20057ba8..48187fdfbaf 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/resize_size_value.pass.cpp @@ -52,7 +52,7 @@ test(C& c1, int size, int x) assert(c1.size() == size); assert(distance(c1.begin(), c1.end()) == c1.size()); CI i = c1.begin(); - for (int j = 0; j < std::min(c1_osize, c1.size()); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < std::min(c1_osize, c1.size()); ++j, ++i) assert(*i == j); for (std::size_t j = c1_osize; j < c1.size(); ++j, ++i) assert(*i == x); diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp index 116ed9aa4b5..9bc5fabb9b4 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp @@ -15,6 +15,7 @@ #include <algorithm> #include <iterator> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -45,7 +46,7 @@ void test(int P, C& c1) { typedef typename C::iterator I; - assert(P < c1.size()); + assert(static_cast<std::size_t>(P) < c1.size()); std::size_t c1_osize = c1.size(); I i = c1.erase(c1.cbegin() + P); assert(i == c1.begin() + P); @@ -55,7 +56,7 @@ test(int P, C& c1) int j = 0; for (; j < P; ++j, ++i) assert(*i == j); - for (++j; j < c1_osize; ++j, ++i) + for (++j; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp index a53abaf85d3..3290a401371 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter_iter.pass.cpp @@ -17,6 +17,7 @@ #include <algorithm> #include <iterator> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -47,7 +48,7 @@ void test(int P, C& c1, int size) { typedef typename C::iterator I; - assert(P + size <= c1.size()); + assert(static_cast<std::size_t>(P + size) <= c1.size()); std::size_t c1_osize = c1.size(); I i = c1.erase(c1.cbegin() + P, c1.cbegin() + (P + size)); assert(i == c1.begin() + P); @@ -57,7 +58,7 @@ test(int P, C& c1, int size) int j = 0; for (; j < P; ++j, ++i) assert(*i == j); - for (j += size; j < c1_osize; ++j, ++i) + for (j += size; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp index b9d9173b3e0..bd5e98c22f9 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_iter_iter.pass.cpp @@ -16,6 +16,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "test_iterators.h" @@ -61,9 +62,9 @@ test(int P, const C& c0, const C& c2) i = c1.begin(); for (int j = 0; j < P; ++j, ++i) assert(*i == j); - for (int j = 0; j < c2.size(); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c2.size(); ++j, ++i) assert(*i == j); - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } { @@ -78,9 +79,9 @@ test(int P, const C& c0, const C& c2) i = c1.begin(); for (int j = 0; j < P; ++j, ++i) assert(*i == j); - for (int j = 0; j < c2.size(); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c2.size(); ++j, ++i) assert(*i == j); - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } { @@ -95,9 +96,9 @@ test(int P, const C& c0, const C& c2) i = c1.begin(); for (int j = 0; j < P; ++j, ++i) assert(*i == j); - for (int j = 0; j < c2.size(); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c2.size(); ++j, ++i) assert(*i == j); - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } } @@ -176,9 +177,9 @@ testI(int P, C& c1, const C& c2) i = c1.begin(); for (int j = 0; j < P; ++j, ++i) assert(*i == j); - for (int j = 0; j < c2.size(); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c2.size(); ++j, ++i) assert(*i == j); - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp index 3c7b0fef28b..0b0c7f66848 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_rvalue.pass.cpp @@ -15,6 +15,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "MoveOnly.h" #include "min_allocator.h" @@ -57,7 +58,7 @@ test(int P, C& c1, int x) assert(*i == MoveOnly(j)); assert(*i == MoveOnly(x)); ++i; - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == MoveOnly(j)); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp index 0efe3b44c60..d91f8e33db5 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_size_value.pass.cpp @@ -15,6 +15,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "min_allocator.h" @@ -56,7 +57,7 @@ test(int P, C& c1, int size, int x) assert(*i == j); for (int j = 0; j < size; ++j, ++i) assert(*i == x); - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp index 04c4ca4f7b2..232486778b7 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/insert_value.pass.cpp @@ -13,6 +13,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "min_allocator.h" @@ -54,7 +55,7 @@ test(int P, C& c1, int x) assert(*i == j); assert(*i == x); ++i; - for (int j = P; j < c1_osize; ++j, ++i) + for (int j = P; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp index aeb62c9d996..6efbbd4083b 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_back.pass.cpp @@ -13,6 +13,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -48,7 +49,7 @@ test(C& c1) assert(c1.size() == c1_osize - 1); assert(distance(c1.begin(), c1.end()) == c1.size()); I i = c1.begin(); - for (int j = 0; j < c1.size(); ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c1.size(); ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp index c7a3a625eab..0dff181baca 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/pop_front.pass.cpp @@ -13,6 +13,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -48,7 +49,7 @@ test(C& c1) assert(c1.size() == c1_osize - 1); assert(distance(c1.begin(), c1.end()) == c1.size()); I i = c1.begin(); - for (int j = 1; j < c1.size(); ++j, ++i) + for (int j = 1; static_cast<std::size_t>(j) < c1.size(); ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp index ee4f3d7f9ed..82b4940a146 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front.pass.cpp @@ -13,6 +13,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -50,7 +51,7 @@ test(C& c1, int x) I i = c1.begin(); assert(*i == x); ++i; - for (int j = 0; j < c1_osize; ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == j); } diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp index ab15ca3326b..33bb2824856 100644 --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_rvalue.pass.cpp @@ -13,6 +13,7 @@ #include <deque> #include <cassert> +#include <cstddef> #include "MoveOnly.h" #include "min_allocator.h" @@ -53,7 +54,7 @@ test(C& c1, int x) I i = c1.begin(); assert(*i == MoveOnly(x)); ++i; - for (int j = 0; j < c1_osize; ++j, ++i) + for (int j = 0; static_cast<std::size_t>(j) < c1_osize; ++j, ++i) assert(*i == MoveOnly(j)); } diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp index 9a828ce195e..3b568b7e06d 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back.pass.cpp @@ -13,6 +13,7 @@ #include <vector> #include <cassert> +#include <cstddef> #include "test_allocator.h" #include "min_allocator.h" #include "asan_testing.h" @@ -24,27 +25,27 @@ int main() c.push_back(0); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(1); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(2); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(3); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(4); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); } { @@ -55,27 +56,27 @@ int main() c.push_back(0); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(1); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(2); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(3); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(4); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); } #if TEST_STD_VER >= 11 @@ -84,27 +85,27 @@ int main() c.push_back(0); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(1); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(2); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(3); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); c.push_back(4); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == j); } #endif diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp index eb9e7b5d0e7..f4a1f5d5f51 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/push_back_rvalue.pass.cpp @@ -13,6 +13,7 @@ #include <vector> #include <cassert> +#include <cstddef> #include "MoveOnly.h" #include "test_allocator.h" #include "min_allocator.h" @@ -26,27 +27,27 @@ int main() c.push_back(MoveOnly(0)); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(1)); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(2)); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(3)); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(4)); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); } { @@ -57,27 +58,27 @@ int main() c.push_back(MoveOnly(0)); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(1)); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(2)); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(3)); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(4)); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); } #if TEST_STD_VER >= 11 @@ -86,27 +87,27 @@ int main() c.push_back(MoveOnly(0)); assert(c.size() == 1); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(1)); assert(c.size() == 2); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(2)); assert(c.size() == 3); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(3)); assert(c.size() == 4); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); c.push_back(MoveOnly(4)); assert(c.size() == 5); assert(is_contiguous_container_asan_correct(c)); - for (int j = 0; j < c.size(); ++j) + for (int j = 0; static_cast<std::size_t>(j) < c.size(); ++j) assert(c[j] == MoveOnly(j)); } #endif |