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

Fix shadow warnings in string_view tests. Patch from STL@microsoft.com

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@285011 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-10-24 20:10:00 +00:00
parent 87c6313718
commit 44543930e4
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/std/strings/basic.string/string.modifiers/string_append/T_size_size.pass.cpp
View File

@@ -120,11 +120,10 @@ int main()
test_npos(S(), SV("12345"), 5, S("")); test_npos(S(), SV("12345"), 5, S(""));
test_npos(S(), SV("12345"), 6, S("not happening")); test_npos(S(), SV("12345"), 6, S("not happening"));
} }
{ {
typedef std::string S; std::string s;
typedef std::string_view SV; std::string_view sv = "EFGH";
S s;
SV sv = "EFGH";
char arr[] = "IJKL"; char arr[] = "IJKL";
s.append("CDEF", 0); // calls append(const char *, len) s.append("CDEF", 0); // calls append(const char *, len)
@@ -154,10 +153,11 @@ int main()
s.append(arr, 0); // calls append(const char *, len) s.append(arr, 0); // calls append(const char *, len)
assert(s == ""); assert(s == "");
s.clear(); s.clear();
}
{ {
S s = "ABCD"; std::string s = "ABCD";
SV sv = s; std::string_view sv = s;
s.append(sv); s.append(sv);
assert(s == "ABCDABCD"); assert(s == "ABCDABCD");
@@ -171,8 +171,8 @@ int main()
} }
{ {
S s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; std::string s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
SV sv = s; std::string_view sv = s;
s.append(sv); s.append(sv);
assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ");
@@ -180,5 +180,4 @@ int main()
s.append(sv, 0, std::string::npos); s.append(sv, 0, std::string::npos);
assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ"); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ");
} }
}
} }

17
test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp
View File

@@ -119,11 +119,10 @@ int main()
test_npos(S(), SV("12345"), 5, S("")); test_npos(S(), SV("12345"), 5, S(""));
test_npos(S(), SV("12345"), 6, S("not happening")); test_npos(S(), SV("12345"), 6, S("not happening"));
} }
{ {
typedef std::string S; std::string s = "ABCD";
typedef std::string_view SV; std::string_view sv = "EFGH";
S s = "ABCD";
SV sv = "EFGH";
char arr[] = "IJKL"; char arr[] = "IJKL";
s.assign("CDEF", 0); // calls assign(const char *, len) s.assign("CDEF", 0); // calls assign(const char *, len)
@@ -153,10 +152,11 @@ int main()
s.assign(arr, 0); // calls assign(const char *, len) s.assign(arr, 0); // calls assign(const char *, len)
assert(s == ""); assert(s == "");
s.clear(); s.clear();
}
{ {
S s = "ABCD"; std::string s = "ABCD";
SV sv = s; std::string_view sv = s;
s.assign(sv); s.assign(sv);
assert(s == "ABCD"); assert(s == "ABCD");
@@ -166,8 +166,8 @@ int main()
} }
{ {
S s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; std::string s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
SV sv = s; std::string_view sv = s;
s.assign(sv); s.assign(sv);
assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
@@ -175,5 +175,4 @@ int main()
s.assign(sv, 0, std::string::npos); s.assign(sv, 0, std::string::npos);
assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
} }
}
} }