diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2021-08-04 15:33:04 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2021-08-07 14:18:29 +0200 |
| commit | f6d1de553dc70b76c39439ff0e74567d50fbb6c0 (patch) | |
| tree | 7a7998ac44cfc3cb4e338248b989fcbff92d3a03 | |
| parent | common/async: drop noexcept on io_context_pool threadfunc (diff) | |
| download | ceph-f6d1de553dc70b76c39439ff0e74567d50fbb6c0.tar.xz ceph-f6d1de553dc70b76c39439ff0e74567d50fbb6c0.zip | |
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 <idryomov@gmail.com>
| -rw-r--r-- | src/common/Thread.cc | 2 | ||||
| -rw-r--r-- | 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 50c4e252efc..aaee01aeff3 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 396e167a884..5242fb5f307 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; |