From a0dfa8c4d29a005009d04dcb52452efb9d74e26e Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 26 Sep 2022 17:38:14 +0200 Subject: Replace qExchange calls with std::exchange qExchange is one of the few remaining functionalities that have not been moved out of qglobal. Given that std::exchange exists in the standard, we can simply move to it everywhere... ...if it weren't for the fact that std::exchange is only constexpr in C++20, and only has its noexceptness specified in (most likely) C++23. Still, we want to move to the existing std functionality where possible, to allow the removal of qglobal includes in lieu of something more fine-grained in the future. So leave any constexpr calls[1] alone for now (and observe that none of our current usages cares about the conditional noexceptness), but replace everything else. [1] QScopedValueRollback' ctor and QExplicitlySharedDataPointerV2::take Task-number: QTBUG-99313 Change-Id: I599cb9846cf319c7ffd3457130938347a75aad25 Reviewed-by: Thiago Macieira --- src/corelib/thread/qsemaphore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/thread') diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index 3df0765902..8823468dbc 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -82,7 +82,7 @@ public: QSemaphore *cancel() noexcept { - return qExchange(m_sem, nullptr); + return std::exchange(m_sem, nullptr); } private: -- cgit v1.2.3