1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement QUniqueHandle::release() using std::exchange

Browse Source 
This does not change the behavior of release() but gives more
compact code.

Task-number: QTBUG-132507
Pick-to: 6.8
Change-Id: I5b34c80409ca0e9e9a5e9aee9ef7bc80017610af
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit ec0c62385e0df00f42bc9fb5e117cb8b994cfc96)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Jøger Hansegård 2025-01-02 10:46:59 +01:00 committed by Qt Cherry-pick Bot
parent cdc8811492
commit b72c4988fb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/tools/quniquehandle_p.h
View File

@ -19,6 +19,7 @@
#include <QtCore/qassert.h> #include <QtCore/qassert.h>
#include <memory> #include <memory>
#include <utility>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -162,9 +163,7 @@ public:
[[nodiscard]] Type release() noexcept [[nodiscard]] Type release() noexcept
{ {
Type handle = m_handle; return std::exchange(m_handle, HandleTraits::invalidValue());
m_handle = HandleTraits::invalidValue();
return handle;
} }
[[nodiscard]] Type *operator&() noexcept // NOLINT(google-runtime-operator) [[nodiscard]] Type *operator&() noexcept // NOLINT(google-runtime-operator)