[PATCH] D19759: [libcxx] [test] Replace one more occurrence of non-Standard std::launch::any with AnyPolicy.

[Stephan T. Lavavej via cfe-commits]

STL_MSFT created this revision.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.

[libcxx] [test] Replace one more occurrence of non-Standard std::launch::any 
with AnyPolicy.

Also, fix MSVC "warning C4101: 'ex': unreferenced local variable".

http://reviews.llvm.org/D19759

Files:
  test/std/thread/futures/futures.async/async.pass.cpp

Index: test/std/thread/futures/futures.async/async.pass.cpp
===================================================================
--- test/std/thread/futures/futures.async/async.pass.cpp
+++ test/std/thread/futures/futures.async/async.pass.cpp
@@ -132,7 +132,7 @@
         test<void>(checkVoid, DPID,  f2);
         test<void>(checkVoid, false, std::launch::async, f2);
         test<void>(checkVoid, true,  std::launch::deferred, f2);
-        test<void>(checkVoid, DPID,  std::launch::any, f2);
+        test<void>(checkVoid, DPID,  AnyPolicy, f2);
     }
     {
         using Ret = std::unique_ptr<int>;
@@ -143,11 +143,11 @@
     {
         std::future<void> f = std::async(f5, 3);
         std::this_thread::sleep_for(ms(300));
-        try { f.get(); assert (false); } catch ( int ex ) {}
+        try { f.get(); assert (false); } catch ( int ) {}
     }
     {
         std::future<void> f = std::async(std::launch::deferred, f5, 3);
         std::this_thread::sleep_for(ms(300));
-        try { f.get(); assert (false); } catch ( int ex ) {}
+        try { f.get(); assert (false); } catch ( int ) {}
     }
 }



Index: test/std/thread/futures/futures.async/async.pass.cpp
===================================================================
--- test/std/thread/futures/futures.async/async.pass.cpp
+++ test/std/thread/futures/futures.async/async.pass.cpp
@@ -132,7 +132,7 @@
         test<void>(checkVoid, DPID,  f2);
         test<void>(checkVoid, false, std::launch::async, f2);
         test<void>(checkVoid, true,  std::launch::deferred, f2);
-        test<void>(checkVoid, DPID,  std::launch::any, f2);
+        test<void>(checkVoid, DPID,  AnyPolicy, f2);
     }
     {
         using Ret = std::unique_ptr<int>;
@@ -143,11 +143,11 @@
     {
         std::future<void> f = std::async(f5, 3);
         std::this_thread::sleep_for(ms(300));
-        try { f.get(); assert (false); } catch ( int ex ) {}
+        try { f.get(); assert (false); } catch ( int ) {}
     }
     {
         std::future<void> f = std::async(std::launch::deferred, f5, 3);
         std::this_thread::sleep_for(ms(300));
-        try { f.get(); assert (false); } catch ( int ex ) {}
+        try { f.get(); assert (false); } catch ( int ) {}
     }
 }

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits