summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-01-18 13:44:26 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-20 12:26:37 +0100
commitdb10b7b40fde80ba8f6243d22cc32487251e983b (patch)
tree478cbca7f75854158b141300abede14c186b9248
parent1f843ca39ee59c5304009faf308ddce791614a02 (diff)
Use Q_FOREVER instead of forever
Public headers should compile with QT_NO_KEYWORDS defined. Change-Id: I5620b4b2600f5e39bb402b97d14fdb257dfe9942 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Jonas Gastal <jgastal@profusion.mobi> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
-rw-r--r--src/corelib/thread/qgenericatomic.h4
1 files changed, 2 insertions, 2 deletions
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 <typename BaseClass> 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 <typename BaseClass> struct QGenericAtomicOps
T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::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;