From db10b7b40fde80ba8f6243d22cc32487251e983b Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 18 Jan 2012 13:44:26 +0100 Subject: Use Q_FOREVER instead of forever Public headers should compile with QT_NO_KEYWORDS defined. Change-Id: I5620b4b2600f5e39bb402b97d14fdb257dfe9942 Reviewed-by: Robin Burchell Reviewed-by: Jonas Gastal Reviewed-by: Thiago Macieira Reviewed-by: Lars Knoll --- src/corelib/thread/qgenericatomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index 575589befc..6836f509dc 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -159,7 +159,7 @@ template struct QGenericAtomicOps T fetchAndStoreRelaxed(T &_q_value, T newValue) { // implement fetchAndStore on top of testAndSet - forever { + Q_FOREVER { register T tmp = load(_q_value); if (BaseClass::testAndSetRelaxed(_q_value, tmp, newValue)) return tmp; @@ -194,7 +194,7 @@ template struct QGenericAtomicOps T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType::AdditiveT valueToAdd) { // implement fetchAndAdd on top of testAndSet - forever { + Q_FOREVER { register T tmp = BaseClass::load(_q_value); if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp + valueToAdd))) return tmp; -- cgit v1.2.3