Skip to content

Commit fe38cfe

Browse files
committed
Merge from upstream.
2 parents ce419a9 + 9a42ec1 commit fe38cfe

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

COPYING

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2012 Jakob Progsch
1+
Copyright (c) 2012 Jakob Progsch, Václav Zeman
22

33
This software is provided 'as-is', without any express or implied
44
warranty. In no event will the authors be held liable for any damages

ThreadPool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ template<class F, class... Args>
9191
auto ThreadPool::enqueue(F&& f, Args&&... args)
9292
-> std::future<typename std::result_of<F(Args...)>::type>
9393
{
94-
typedef typename std::result_of<F(Args...)>::type return_type;
94+
using return_type = typename std::result_of<F(Args...)>::type;
9595

9696
auto task = std::make_shared< std::packaged_task<return_type()> >(
9797
std::bind(std::forward<F>(f), std::forward<Args>(args)...)
@@ -119,7 +119,7 @@ inline ThreadPool::~ThreadPool()
119119
stop = true;
120120
}
121121
condition.notify_all();
122-
for(std::thread & worker: workers)
122+
for(std::thread &worker: workers)
123123
worker.join();
124124
}
125125

0 commit comments

Comments
 (0)