From 61329522afd8e3d7ca0c441cb76d4d1886479466 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Tue, 4 Apr 2017 02:54:27 +0000 Subject: [PATCH] Fix more -Wshadow warnings introduced by recent Clang change llvm-svn: 299411 --- .../associative/map/map.cons/iter_iter_comp_alloc.pass.cpp | 2 -- .../associative/multimap/multimap.ops/equal_range.pass.cpp | 1 - .../containers/associative/multimap/multimap.ops/find.pass.cpp | 1 - .../associative/multimap/multimap.ops/lower_bound.pass.cpp | 1 - .../associative/multimap/multimap.ops/upper_bound.pass.cpp | 1 - .../optional.object.assign/assign_value.pass.cpp | 1 - 6 files changed, 7 deletions(-) diff --git a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp index 705fb580487b..923a2124ece4 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp @@ -92,7 +92,6 @@ int main() V(3, 2), }; { - typedef std::pair V; typedef min_allocator A; typedef test_compare > C; A a; @@ -106,7 +105,6 @@ int main() assert(m.get_allocator() == a); } { - typedef std::pair V; typedef explicit_allocator A; typedef test_compare > C; A a; diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp index df46d376e028..9e67f97f9ac0 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp @@ -183,7 +183,6 @@ int main() #endif #if TEST_STD_VER > 11 { - typedef std::pair V; typedef std::multimap> M; typedef std::pair R; diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp index f5295e52d192..474b7b6ac59c 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp @@ -147,7 +147,6 @@ int main() #endif #if TEST_STD_VER > 11 { - typedef std::pair V; typedef std::multimap> M; typedef M::iterator R; diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp index 8a650fa55975..28ff332542b4 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp @@ -155,7 +155,6 @@ int main() #endif #if TEST_STD_VER > 11 { - typedef std::pair V; typedef std::multimap> M; typedef M::iterator R; V ar[] = diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp index 05760dc0e751..4f4b3884f28e 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp @@ -155,7 +155,6 @@ int main() #endif #if TEST_STD_VER > 11 { - typedef std::pair V; typedef std::multimap> M; typedef M::iterator R; V ar[] = diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp index 1207e24150ff..0fcc52be1354 100644 --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp @@ -216,7 +216,6 @@ void test_throws() #ifndef TEST_HAS_NO_EXCEPTIONS using T = ThrowAssign; { - using T = ThrowAssign; optional opt; try { opt = 42;