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

Work around test failure on 32 bit OS X

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@296840 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-03-02 23:18:40 +00:00
parent 92dbfc48cc
commit 778ec30428
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/std/strings/basic.string/string.modifiers/string_replace/size_size_T_size_size.pass.cpp
View File

@@ -29,16 +29,22 @@ test(S s, typename S::size_type pos1, typename S::size_type n1,
SV sv, typename S::size_type pos2, typename S::size_type n2, SV sv, typename S::size_type pos2, typename S::size_type n2,
S expected) S expected)
{ {
typedef typename S::size_type SizeT;
static_assert((!std::is_same<S, SV>::value), ""); static_assert((!std::is_same<S, SV>::value), "");
const typename S::size_type old_size = s.size();
// String and string_view may not always share the same size type,
// but both types should have the same size (ex. int vs long)
static_assert(sizeof(SizeT) == sizeof(typename SV::size_type), "");
const SizeT old_size = s.size();
S s0 = s; S s0 = s;
if (pos1 <= old_size && pos2 <= sv.size()) if (pos1 <= old_size && pos2 <= sv.size())
{ {
s.replace(pos1, n1, sv, pos2, n2); s.replace(pos1, n1, sv, pos2, n2);
LIBCPP_ASSERT(s.__invariants()); LIBCPP_ASSERT(s.__invariants());
assert(s == expected); assert(s == expected);
typename S::size_type xlen = std::min(n1, old_size - pos1); SizeT xlen = std::min<SizeT>(n1, old_size - pos1);
typename S::size_type rlen = std::min(n2, sv.size() - pos2); SizeT rlen = std::min<SizeT>(n2, sv.size() - pos2);
assert(s.size() == old_size - xlen + rlen); assert(s.size() == old_size - xlen + rlen);
} }
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS
@@ -64,16 +70,17 @@ test_npos(S s, typename S::size_type pos1, typename S::size_type n1,
SV sv, typename S::size_type pos2, SV sv, typename S::size_type pos2,
S expected) S expected)
{ {
typedef typename S::size_type SizeT;
static_assert((!std::is_same<S, SV>::value), ""); static_assert((!std::is_same<S, SV>::value), "");
const typename S::size_type old_size = s.size(); const SizeT old_size = s.size();
S s0 = s; S s0 = s;
if (pos1 <= old_size && pos2 <= sv.size()) if (pos1 <= old_size && pos2 <= sv.size())
{ {
s.replace(pos1, n1, sv, pos2); s.replace(pos1, n1, sv, pos2);
LIBCPP_ASSERT(s.__invariants()); LIBCPP_ASSERT(s.__invariants());
assert(s == expected); assert(s == expected);
typename S::size_type xlen = std::min(n1, old_size - pos1); SizeT xlen = std::min<SizeT>(n1, old_size - pos1);
typename S::size_type rlen = std::min(S::npos, sv.size() - pos2); SizeT rlen = std::min<SizeT>(S::npos, sv.size() - pos2);
assert(s.size() == old_size - xlen + rlen); assert(s.size() == old_size - xlen + rlen);
} }
#ifndef TEST_HAS_NO_EXCEPTIONS #ifndef TEST_HAS_NO_EXCEPTIONS