summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-04-28 02:00:52 +0000
committerEric Fiselier <eric@efcs.ca>2016-04-28 02:00:52 +0000
commit588e1dbda29ad7526d872bfdc2c810d32555c9d2 (patch)
tree2452c52bca55b7b1d46cc939e233e17de6ab6112
parent3b4842b56f9b0e9c1e3ff157bbfae1e651a24a05 (diff)
downloadbcm5719-llvm-588e1dbda29ad7526d872bfdc2c810d32555c9d2.tar.gz
bcm5719-llvm-588e1dbda29ad7526d872bfdc2c810d32555c9d2.zip
Rename function parameters to avoid shadowing. Patch from STL@microsoft.com
llvm-svn: 267838
-rw-r--r--libcxx/test/std/thread/futures/futures.async/async.pass.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/std/thread/futures/futures.async/async.pass.cpp b/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
index 2c1313b7a2f..5b1a60cabf7 100644
--- a/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
+++ b/libcxx/test/std/thread/futures/futures.async/async.pass.cpp
@@ -47,10 +47,10 @@ void f2()
std::this_thread::sleep_for(ms(200));
}
-std::unique_ptr<int> f3(int i)
+std::unique_ptr<int> f3(int j)
{
std::this_thread::sleep_for(ms(200));
- return std::unique_ptr<int>(new int(i));
+ return std::unique_ptr<int>(new int(j));
}
std::unique_ptr<int> f4(std::unique_ptr<int>&& p)
@@ -59,10 +59,10 @@ std::unique_ptr<int> f4(std::unique_ptr<int>&& p)
return std::move(p);
}
-void f5(int i)
+void f5(int j)
{
std::this_thread::sleep_for(ms(200));
- throw i;
+ throw j;
}
int main()
OpenPOWER on IntegriCloud