llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-23 01:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libcxx] [test] D27269: Fix MSVC x64 warning C4267 "conversion from 'size_t' to 'int' [or 'unsigned int'], possible loss of data", part 3/4.

Browse Source 
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.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@288753 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stephan T. Lavavej
2016-12-06 01:14:51 +00:00
parent ae5809a70c
commit 6504ee5755
7 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/std/strings/basic.string/string.cons/substr.pass.cpp
View File

@@ -39,7 +39,7 @@ test(S str, unsigned pos)
{
S s2(str, pos);
LIBCPP_ASSERT(s2.__invariants());
unsigned rlen = str.size() - pos;
typename S::size_type rlen = str.size() - pos;
assert(s2.size() == rlen);
assert(T::compare(s2.data(), str.data() + pos, rlen) == 0);
assert(s2.get_allocator() == A());
@@ -71,7 +71,7 @@ test(S str, unsigned pos, unsigned n)
{
S s2(str, pos, n);
LIBCPP_ASSERT(s2.__invariants());
unsigned rlen = std::min<unsigned>(str.size() - pos, n);
typename S::size_type rlen = std::min<typename S::size_type>(str.size() - pos, n);
assert(s2.size() == rlen);
assert(T::compare(s2.data(), str.data() + pos, rlen) == 0);
assert(s2.get_allocator() == A());
@@ -104,7 +104,7 @@ test(S str, unsigned pos, unsigned n, const typename S::allocator_type& a)
{
S s2(str, pos, n, a);
LIBCPP_ASSERT(s2.__invariants());
unsigned rlen = std::min<unsigned>(str.size() - pos, n);
typename S::size_type rlen = std::min<typename S::size_type>(str.size() - pos, n);
assert(s2.size() == rlen);
assert(T::compare(s2.data(), str.data() + pos, rlen) == 0);
assert(s2.get_allocator() == a);