From a32eb83b2fce4863fa0e9a235c53a873b9b07e87 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Thu, 28 Apr 2016 02:00:52 +0000 Subject: [PATCH] Rename function parameters to avoid shadowing. Patch from STL@microsoft.com git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@267838 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/std/thread/futures/futures.async/async.pass.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/std/thread/futures/futures.async/async.pass.cpp b/test/std/thread/futures/futures.async/async.pass.cpp index 2c1313b7a..5b1a60cab 100644 --- a/test/std/thread/futures/futures.async/async.pass.cpp +++ b/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()