Author: ericwf
Date: Mon Apr 3 21:54:27 2017
New Revision: 299411
URL: http://llvm.org/viewvc/llvm-project?rev=299411&view=rev
Log:
Fix more -Wshadow warnings introduced by recent Clang change
Modified:
libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
Modified:
libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
(original)
+++
libcxx/trunk/test/std/containers/associative/map/map.cons/iter_iter_comp_alloc.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -92,7 +92,6 @@ int main()
V(3, 2),
};
{
- typedef std::pair<const int, double> V;
typedef min_allocator<V> A;
typedef test_compare<std::less<int> > C;
A a;
@@ -106,7 +105,6 @@ int main()
assert(m.get_allocator() == a);
}
{
- typedef std::pair<const int, double> V;
typedef explicit_allocator<V> A;
typedef test_compare<std::less<int> > C;
A a;
Modified:
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
(original)
+++
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/equal_range.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -183,7 +183,6 @@ int main()
#endif
#if TEST_STD_VER > 11
{
- typedef std::pair<const int, double> V;
typedef std::multimap<int, double, std::less<>> M;
typedef std::pair<M::iterator, M::iterator> R;
Modified:
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
(original)
+++
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/find.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -147,7 +147,6 @@ int main()
#endif
#if TEST_STD_VER > 11
{
- typedef std::pair<const int, double> V;
typedef std::multimap<int, double, std::less<>> M;
typedef M::iterator R;
Modified:
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
(original)
+++
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/lower_bound.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -155,7 +155,6 @@ int main()
#endif
#if TEST_STD_VER > 11
{
- typedef std::pair<const int, double> V;
typedef std::multimap<int, double, std::less<>> M;
typedef M::iterator R;
V ar[] =
Modified:
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
(original)
+++
libcxx/trunk/test/std/containers/associative/multimap/multimap.ops/upper_bound.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -155,7 +155,6 @@ int main()
#endif
#if TEST_STD_VER > 11
{
- typedef std::pair<const int, double> V;
typedef std::multimap<int, double, std::less<>> M;
typedef M::iterator R;
V ar[] =
Modified:
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp?rev=299411&r1=299410&r2=299411&view=diff
==============================================================================
---
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
(original)
+++
libcxx/trunk/test/std/utilities/optional/optional.object/optional.object.assign/assign_value.pass.cpp
Mon Apr 3 21:54:27 2017
@@ -216,7 +216,6 @@ void test_throws()
#ifndef TEST_HAS_NO_EXCEPTIONS
using T = ThrowAssign;
{
- using T = ThrowAssign;
optional<T> opt;
try {
opt = 42;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
