From 588e1dbda29ad7526d872bfdc2c810d32555c9d2 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 28 Apr 2016 02:00:52 +0000 Subject: Rename function parameters to avoid shadowing. Patch from STL@microsoft.com llvm-svn: 267838 --- libcxx/test/std/thread/futures/futures.async/async.pass.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libcxx/test/std/thread/futures/futures.async') 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 f3(int i) +std::unique_ptr f3(int j) { std::this_thread::sleep_for(ms(200)); - return std::unique_ptr(new int(i)); + return std::unique_ptr(new int(j)); } std::unique_ptr f4(std::unique_ptr&& p) @@ -59,10 +59,10 @@ std::unique_ptr f4(std::unique_ptr&& 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() -- cgit v1.2.3