diff options
author | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:14:51 +0000 |
---|---|---|
committer | Stephan T. Lavavej <stl@exchange.microsoft.com> | 2016-12-06 01:14:51 +0000 |
commit | d4b83e6dfd075856468086364f792de00cdb2f9f (patch) | |
tree | 79f572f5ea2bc09944b3152f3e45226342d589fa /libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp | |
parent | f41847c401789d8f4a6fce0827579c7e3cfc47d6 (diff) | |
download | bcm5719-llvm-d4b83e6dfd075856468086364f792de00cdb2f9f.tar.gz bcm5719-llvm-d4b83e6dfd075856468086364f792de00cdb2f9f.zip |
[libcxx] [test] D27269: Fix MSVC x64 warning C4267 "conversion from 'size_t' to 'int' [or 'unsigned int'], possible loss of data", part 3/4.
test/std/containers/sequences/vector.bool/copy.pass.cpp
test/std/containers/sequences/vector.bool/copy_alloc.pass.cpp
test/std/containers/sequences/vector/vector.cons/copy.pass.cpp
test/std/containers/sequences/vector/vector.cons/copy_alloc.pass.cpp
Change "unsigned s = x.size();" to "typename C::size_type s = x.size();"
because that's what it returns.
test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp
Include <cstddef>, then change "unsigned n = T::length(s);"
to "std::size_t n = T::length(s);" because that's what char_traits returns.
test/std/strings/basic.string/string.cons/substr.pass.cpp
Change unsigned to typename S::size_type because that's what str.size() returns.
test/std/utilities/template.bitset/bitset.cons/ull_ctor.pass.cpp
This was needlessly truncating std::size_t to unsigned.
It's being used to compare and initialize std::size_t.
llvm-svn: 288753
Diffstat (limited to 'libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp')
-rw-r--r-- | libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp index b678247fb24..f56780095b7 100644 --- a/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.cons/pointer_alloc.pass.cpp @@ -15,6 +15,7 @@ #include <stdexcept> #include <algorithm> #include <cassert> +#include <cstddef> #include "test_macros.h" #include "test_allocator.h" @@ -27,7 +28,7 @@ test(const charT* s) typedef std::basic_string<charT, std::char_traits<charT>, test_allocator<charT> > S; typedef typename S::traits_type T; typedef typename S::allocator_type A; - unsigned n = T::length(s); + std::size_t n = T::length(s); S s2(s); LIBCPP_ASSERT(s2.__invariants()); assert(s2.size() == n); @@ -42,7 +43,7 @@ test(const charT* s, const A& a) { typedef std::basic_string<charT, std::char_traits<charT>, A> S; typedef typename S::traits_type T; - unsigned n = T::length(s); + std::size_t n = T::length(s); S s2(s, a); LIBCPP_ASSERT(s2.__invariants()); assert(s2.size() == n); |