diff options
author | Zhuyie <zhuyie@gmail.com> | 2020-09-25 09:36:43 +0000 |
---|---|---|
committer | David Tellenbach <david.tellenbach@me.com> | 2020-09-25 09:36:43 +0000 |
commit | e4b24e7fb24c280e1db096edd983ee29e255e3b8 (patch) | |
tree | 5b23487489c0590e6fa37762ab44637dbf9dc878 /unsupported | |
parent | ce5c59729dfc9c970bbdaeb4a11b97427e65834e (diff) |
Fix Eigen::ThreadPool::CurrentThreadId returning wrong thread id when EIGEN_AVOID_THREAD_LOCAL and NDEBUG are defined
Diffstat (limited to 'unsupported')
-rw-r--r-- | unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h index 43a274651..23a2b5467 100644 --- a/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h +++ b/unsupported/Eigen/CXX11/src/ThreadPool/NonBlockingThreadPool.h @@ -255,7 +255,9 @@ class ThreadPoolTempl : public Eigen::ThreadPoolInterface { #ifndef EIGEN_THREAD_LOCAL std::unique_ptr<PerThread> new_pt(new PerThread()); per_thread_map_mutex_.lock(); - eigen_plain_assert(per_thread_map_.emplace(GlobalThreadIdHash(), std::move(new_pt)).second); + bool insertOK = per_thread_map_.emplace(GlobalThreadIdHash(), std::move(new_pt)).second; + eigen_plain_assert(insertOK); + EIGEN_UNUSED_VARIABLE(insertOK); per_thread_map_mutex_.unlock(); init_barrier_->Notify(); init_barrier_->Wait(); |