[libcxx] r288573 - Work around more -Wshadow warnings

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Fri Dec 2 18:26:29 PST 2016


Author: ericwf
Date: Fri Dec  2 20:26:28 2016
New Revision: 288573

URL: http://llvm.org/viewvc/llvm-project?rev=288573&view=rev
Log:
Work around more -Wshadow warnings

Modified:
    libcxx/trunk/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
    libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp

Modified: libcxx/trunk/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp?rev=288573&r1=288572&r2=288573&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp (original)
+++ libcxx/trunk/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp Fri Dec  2 20:26:28 2016
@@ -41,7 +41,7 @@ private:
 class ThrowOnCopy {
 public:
     ThrowOnCopy() : should_throw(false) {}
-    explicit ThrowOnCopy(bool should_throw) : should_throw(should_throw) {}
+    explicit ThrowOnCopy(bool xshould_throw) : should_throw(xshould_throw) {}
 
     ThrowOnCopy(ThrowOnCopy const & other)
         : should_throw(other.should_throw)

Modified: libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp?rev=288573&r1=288572&r2=288573&view=diff
==============================================================================
--- libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp (original)
+++ libcxx/trunk/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp Fri Dec  2 20:26:28 2016
@@ -81,7 +81,7 @@ test_int_array_struct_source()
 
 struct test1 {
     test1() : c(0) { }
-    test1(char c) : c(c + 1) { }
+    test1(char xc) : c(xc + 1) { }
     char c;
 };
 




More information about the cfe-commits mailing list