From 40dc33a9d333cb6befae040d64847e175d6dafa2 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 3 Feb 2025 17:30:21 +0100 Subject: [PATCH] Fix broken auto-links in QAtomic docs - There is no load() in Q*Atomic (unlike std::atomic), so link to loadAcquire()/loadRelaxed(), depending on context. - Also remove the template argument, , which prevents qdoc linking. Amends b62c3a85452aecf4f6c863645db34857b05d5ebf and 329e09a3c303fad1ab001de74924288aae1e7a9d. Pick-to: 6.8 6.5 6.2 5.15 Change-Id: I8c58674ffc7e779fee982555edcd45ed40d4c17d Reviewed-by: Marc Mutz (cherry picked from commit 9854482835071993968a524878b601c1d9327f1e) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qatomic.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index a437eb33190..a0cbd6a15a8 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -398,7 +398,7 @@ Atomic test-and-set. \note If you use this function in a loop, consider using the overload with the - additional \c{T ¤tValue} argument instead, which avoids the extra load() on + additional \c{T ¤tValue} argument instead, which avoids the extra loadRelaxed() on failure. If the current value of this QAtomicInteger is the \a expectedValue, @@ -420,7 +420,7 @@ Atomic test-and-set. \note If you use this function in a loop, consider using the overload with the - additional \c{T ¤tValue} argument instead, which avoids the extra load() on + additional \c{T ¤tValue} argument instead, which avoids the extra loadAcquire() on failure. If the current value of this QAtomicInteger is the \a expectedValue, @@ -442,7 +442,7 @@ Atomic test-and-set. \note If you use this function in a loop, consider using the overload with the - additional \c{T ¤tValue} argument instead, which avoids the extra load() on + additional \c{T ¤tValue} argument instead, which avoids the extra loadRelaxed() on failure. If the current value of this QAtomicInteger is the \a expectedValue, @@ -464,7 +464,7 @@ Atomic test-and-set. \note If you use this function in a loop, consider using the overload with the - additional \c{T ¤tValue} argument instead, which avoids the extra load() on + additional \c{T ¤tValue} argument instead, which avoids the extra loadAcquire() on failure. If the current value of this QAtomicInteger is the \a expectedValue, @@ -1060,7 +1060,7 @@ This macro is defined when only certain generations of the processor support atomic reference counting. Use the - QAtomicInteger::isReferenceCountingNative() function to check what + QAtomicInteger::isReferenceCountingNative() function to check what your processor supports. \e{nn} is the size of the integer, in bits (8, 16, 32 or 64). @@ -1103,7 +1103,7 @@ This macro is defined when only certain generations of the processor support atomic test-and-set on integers. Use the - QAtomicInteger::isTestAndSetNative() function to check what your + QAtomicInteger::isTestAndSetNative() function to check what your processor supports. \e{nn} is the size of the integer, in bits (8, 16, 32 or 64). @@ -1146,7 +1146,7 @@ This macro is defined when only certain generations of the processor support atomic fetch-and-store on integers. Use the - QAtomicInteger::isFetchAndStoreNative() function to check what your + QAtomicInteger::isFetchAndStoreNative() function to check what your processor supports. \e{nn} is the size of the integer, in bits (8, 16, 32 or 64). @@ -1189,7 +1189,7 @@ This macro is defined when only certain generations of the processor support atomic fetch-and-add on integers. Use the - QAtomicInteger::isFetchAndAddNative() function to check what your + QAtomicInteger::isFetchAndAddNative() function to check what your processor supports. \e{nn} is the size of the integer, in bits (8, 16, 32 or 64).