diff options
author | Davide Italiano <davide@freebsd.org> | 2016-11-28 08:53:41 +0000 |
---|---|---|
committer | Davide Italiano <davide@freebsd.org> | 2016-11-28 08:53:41 +0000 |
commit | 3ea0bfa7e02808637eca838933aee980cc1c1d88 (patch) | |
tree | 689f58652be98d73eca2c64d7986043da665ec19 /llvm/lib/Support/ThreadPool.cpp | |
parent | 43c24282039f03caabf7a7b2196d22a076f5b592 (diff) | |
download | bcm5719-llvm-3ea0bfa7e02808637eca838933aee980cc1c1d88.tar.gz bcm5719-llvm-3ea0bfa7e02808637eca838933aee980cc1c1d88.zip |
[ThreadPool] Simplify the interface. NFCI.
The callers don't use the return value. Found by Michael
Spencer.
llvm-svn: 288016
Diffstat (limited to 'llvm/lib/Support/ThreadPool.cpp')
-rw-r--r-- | llvm/lib/Support/ThreadPool.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/llvm/lib/Support/ThreadPool.cpp b/llvm/lib/Support/ThreadPool.cpp index db03a4d6240..022f32a1378 100644 --- a/llvm/lib/Support/ThreadPool.cpp +++ b/llvm/lib/Support/ThreadPool.cpp @@ -82,7 +82,7 @@ void ThreadPool::wait() { [&] { return !ActiveThreads && Tasks.empty(); }); } -std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { +void ThreadPool::asyncImpl(TaskTy Task) { /// Wrap the Task in a packaged_task to return a future object. PackagedTaskTy PackagedTask(std::move(Task)); auto Future = PackagedTask.get_future(); @@ -96,7 +96,6 @@ std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { Tasks.push(std::move(PackagedTask)); } QueueCondition.notify_one(); - return Future.share(); } // The destructor joins all threads, waiting for completion. @@ -136,7 +135,7 @@ void ThreadPool::wait() { } } -std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { +void ThreadPool::asyncImpl(TaskTy Task) { #ifndef _MSC_VER // Get a Future with launch::deferred execution using std::async auto Future = std::async(std::launch::deferred, std::move(Task)).share(); @@ -148,7 +147,6 @@ std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { PackagedTaskTy PackagedTask([Future](bool) -> bool { Future.get(); return false; }); #endif Tasks.push(std::move(PackagedTask)); - return Future; } ThreadPool::~ThreadPool() { |