From 009fb08d14c1bbca781832d0116463e003507f0f Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 24 Oct 2016 20:10:00 +0000 Subject: Fix shadow warnings in string_view tests. Patch from STL@microsoft.com llvm-svn: 285011 --- .../string_assign/T_size_size.pass.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'libcxx/test/std/strings/basic.string/string.modifiers/string_assign') diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp index 8b089c493c1..793bf6e399b 100644 --- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/T_size_size.pass.cpp @@ -119,11 +119,10 @@ int main() test_npos(S(), SV("12345"), 5, S("")); test_npos(S(), SV("12345"), 6, S("not happening")); } + { - typedef std::string S; - typedef std::string_view SV; - S s = "ABCD"; - SV sv = "EFGH"; + std::string s = "ABCD"; + std::string_view sv = "EFGH"; char arr[] = "IJKL"; s.assign("CDEF", 0); // calls assign(const char *, len) @@ -137,7 +136,7 @@ int main() s.assign(sv, 0); // calls assign(T, pos, npos) assert(s == sv); s.clear(); - + s.assign(sv, 0, std::string::npos); // calls assign(T, pos, npos) assert(s == sv); s.clear(); @@ -153,10 +152,11 @@ int main() s.assign(arr, 0); // calls assign(const char *, len) assert(s == ""); s.clear(); + } { - S s = "ABCD"; - SV sv = s; + std::string s = "ABCD"; + std::string_view sv = s; s.assign(sv); assert(s == "ABCD"); @@ -164,10 +164,10 @@ int main() s.assign(sv, 0, std::string::npos); assert(s == "ABCD"); } - + { - S s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - SV sv = s; + std::string s = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + std::string_view sv = s; s.assign(sv); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); @@ -175,5 +175,4 @@ int main() s.assign(sv, 0, std::string::npos); assert(s == "ABCDEFGHIJKLMNOPQRSTUVWXYZ"); } - } } -- cgit v1.2.3