summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-12-03 02:26:28 +0000
committerEric Fiselier <eric@efcs.ca>2016-12-03 02:26:28 +0000
commit46fcbb4da4f2c5536c7bac97fe0f905e8ef885bb (patch)
tree5ecfd745017a48f123039b9ecf3006dcc71ecff1
parent997dac8709737c9c8ab94fd7f799207dcfabf885 (diff)
downloadbcm5719-llvm-46fcbb4da4f2c5536c7bac97fe0f905e8ef885bb.tar.gz
bcm5719-llvm-46fcbb4da4f2c5536c7bac97fe0f905e8ef885bb.zip
Work around more -Wshadow warnings
llvm-svn: 288573
-rw-r--r--libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp2
-rw-r--r--libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
index fcf27b014fc..43324e9418f 100644
--- a/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
+++ b/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
@@ -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)
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
index b56d31b9d0d..f39436048ae 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -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;
};
OpenPOWER on IntegriCloud