Skip to content

[ML] Remove old clang workaround #883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 10, 2019
Merged

[ML] Remove old clang workaround #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7a8f67
[ML] Remove old clang workaround
Dec 10, 2019
b713492
clang-format
Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions lib/core/Concurrency.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,10 @@ class CThreadPoolExecutor final : public CExecutor {
CStaticThreadPool m_ThreadPool;
};

//! Older versions of clang of clang have problems resolving the correct
//! constructor for std::unique_ptr because of a standard defect.
//!
//! \see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579
template<typename EXECUTOR, typename... ARGS>
std::unique_ptr<CExecutor> makeUniqueWorkaroundCwg1579(ARGS&&... args) {
std::unique_ptr<CExecutor> result =
std::make_unique<EXECUTOR>(std::forward<ARGS>(args)...);
return result;
}

class CExecutorHolder {
public:
CExecutorHolder()
: m_ThreadPoolSize{0},
m_Executor(makeUniqueWorkaroundCwg1579<CImmediateExecutor>()) {}
: m_ThreadPoolSize{0}, m_Executor(std::make_unique<CImmediateExecutor>()) {}

static CExecutorHolder makeThreadPool(std::size_t threadPoolSize) {
if (threadPoolSize == 0) {
Expand Down Expand Up @@ -84,7 +72,7 @@ class CExecutorHolder {
private:
CExecutorHolder(std::size_t threadPoolSize)
: m_ThreadPoolSize{threadPoolSize},
m_Executor(makeUniqueWorkaroundCwg1579<CThreadPoolExecutor>(threadPoolSize)) {}
m_Executor(std::make_unique<CThreadPoolExecutor>(threadPoolSize)) {}

private:
std::size_t m_ThreadPoolSize;
Expand Down