From f6d1de553dc70b76c39439ff0e74567d50fbb6c0 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 4 Aug 2021 15:33:04 +0200 Subject: [PATCH] Revert "common/Thread: make _entry_func noexcept" This reverts commit 41142c93a727ed0be73178271169bd0a5cdbe206. With g++ 8 noexcept here does more harm than good. See the previous patch for details. Signed-off-by: Ilya Dryomov --- src/common/Thread.cc | 2 +- src/common/Thread.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Thread.cc b/src/common/Thread.cc index 50c4e252efc4..aaee01aeff31 100644 --- a/src/common/Thread.cc +++ b/src/common/Thread.cc @@ -70,7 +70,7 @@ Thread::~Thread() { } -void *Thread::_entry_func(void *arg) noexcept { +void *Thread::_entry_func(void *arg) { void *r = ((Thread*)arg)->entry_wrapper(); return r; } diff --git a/src/common/Thread.h b/src/common/Thread.h index 396e167a884d..5242fb5f3075 100644 --- a/src/common/Thread.h +++ b/src/common/Thread.h @@ -48,7 +48,7 @@ class Thread { virtual void *entry() = 0; private: - static void *_entry_func(void *arg) noexcept; + static void *_entry_func(void *arg); public: const pthread_t &get_thread_id() const; -- 2.47.3