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/deque/deque.modifiers/erase_iter.pass.cpp | |
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/deque/deque.modifiers/erase_iter.pass.cpp')
-rw-r--r-- | libcxx/test/std/containers/sequences/deque/deque.modifiers/erase_iter.pass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |