From 7e1edbb9a2cc0dce75940fc7e5695a852a2337e2 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 19 Apr 2019 13:26:48 -0700 Subject: [PATCH] Fix a build error in onnxruntime/core/common/threadpool.cc --- onnxruntime/core/common/threadpool.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/onnxruntime/core/common/threadpool.cc b/onnxruntime/core/common/threadpool.cc index f7a7f7c536..7f07b0d3fa 100644 --- a/onnxruntime/core/common/threadpool.cc +++ b/onnxruntime/core/common/threadpool.cc @@ -8,7 +8,15 @@ #if defined(_MSC_VER) #pragma warning(disable : 4267) #endif + +#if defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#endif #include +#if defined(__GNUC__) +#pragma GCC diagnostic pop +#endif #else #include "task_thread_pool.h" #endif @@ -58,10 +66,10 @@ class Barrier { bool notified_; }; -class ThreadPool::Impl : public Eigen::NonBlockingThreadPool { +class ThreadPool::Impl : public Eigen::ThreadPool { public: Impl(const std::string& name, int num_threads) - : Eigen::NonBlockingThreadPool(num_threads) { + : Eigen::ThreadPool(num_threads) { ORT_UNUSED_PARAMETER(name); }