AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSemaphoreReleaser: two minor code improvements

Browse Source 
- use qExchange() in cancel()
- use cancel() instead of manual pointer manipulations in the move ctor

Change-Id: Ica3a3a1e339500c5e5a0c0646e7a95c7c5d435db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2019-09-04 19:46:59 +02:00
parent 72106832e4
commit 2c0ad8dd3a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/thread/qsemaphore.h
View File

@ -80,8 +80,7 @@ public:
explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) noexcept explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) noexcept
: m_sem(sem), m_n(n) {} : m_sem(sem), m_n(n) {}
QSemaphoreReleaser(QSemaphoreReleaser &&other) noexcept QSemaphoreReleaser(QSemaphoreReleaser &&other) noexcept
: m_sem(other.m_sem), m_n(other.m_n) : m_sem(other.cancel()), m_n(other.m_n) {}
{ other.m_sem = nullptr; }
QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) noexcept QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) noexcept
{ QSemaphoreReleaser moved(std::move(other)); swap(moved); return *this; } { QSemaphoreReleaser moved(std::move(other)); swap(moved); return *this; }
@ -102,9 +101,7 @@ public:
QSemaphore *cancel() noexcept QSemaphore *cancel() noexcept
{ {
QSemaphore *old = m_sem; return qExchange(m_sem, nullptr);
m_sem = nullptr;
return old;
} }
private: private: