diff options
Diffstat (limited to 'libcxx/test/std/strings/basic.string')
3 files changed, 9 insertions, 6 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp index 81b4b77fb1a..7bd898bee44 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/size_char_alloc.pass.cpp @@ -15,6 +15,7 @@ #include <stdexcept> #include <algorithm> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "test_allocator.h" @@ -61,7 +62,7 @@ test(Tp n, Tp c) typedef typename S::allocator_type A; S s2(n, c); LIBCPP_ASSERT(s2.__invariants()); - assert(s2.size() == n); + assert(s2.size() == static_cast<std::size_t>(n)); for (int i = 0; i < n; ++i) assert(s2[i] == c); assert(s2.get_allocator() == A()); @@ -77,7 +78,7 @@ test(Tp n, Tp c, const A& a) typedef typename S::traits_type T; S s2(n, c, a); LIBCPP_ASSERT(s2.__invariants()); - assert(s2.size() == n); + assert(s2.size() == static_cast<std::size_t>(n)); for (int i = 0; i < n; ++i) assert(s2[i] == c); assert(s2.get_allocator() == a); diff --git a/libcxx/test/std/strings/basic.string/string.iterators/end.pass.cpp b/libcxx/test/std/strings/basic.string/string.iterators/end.pass.cpp index abd0c2d853d..3ad60269b3a 100644 --- a/libcxx/test/std/strings/basic.string/string.iterators/end.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.iterators/end.pass.cpp @@ -14,6 +14,7 @@ #include <string> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -29,8 +30,8 @@ test(S s) assert(e == s.begin()); assert(ce == cs.begin()); } - assert(e - s.begin() == s.size()); - assert(ce - cs.begin() == cs.size()); + assert(static_cast<std::size_t>(e - s.begin()) == s.size()); + assert(static_cast<std::size_t>(ce - cs.begin()) == cs.size()); } int main() diff --git a/libcxx/test/std/strings/basic.string/string.iterators/rend.pass.cpp b/libcxx/test/std/strings/basic.string/string.iterators/rend.pass.cpp index c8c2d9ccadc..93c47e6bb39 100644 --- a/libcxx/test/std/strings/basic.string/string.iterators/rend.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.iterators/rend.pass.cpp @@ -14,6 +14,7 @@ #include <string> #include <cassert> +#include <cstddef> #include "min_allocator.h" @@ -29,8 +30,8 @@ test(S s) assert(e == s.rbegin()); assert(ce == cs.rbegin()); } - assert(e - s.rbegin() == s.size()); - assert(ce - cs.rbegin() == cs.size()); + assert(static_cast<std::size_t>(e - s.rbegin()) == s.size()); + assert(static_cast<std::size_t>(ce - cs.rbegin()) == cs.size()); } int main() |
