summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-10-21 13:59:45 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-22 05:05:22 +0200
commit53674983e0f2c45e9bdf3eb07edf9a3823644ac3 (patch)
tree04e1ccdf4ef6873fdaf7ff8d6c94ad3633ebfc05
parentc2ca2d7fb35a866d634b8707596cae0ab6205448 (diff)
Compile with clang
When using methods from a template base class, the lookup needs to be qualified. See http://clang.llvm.org/compatibility.html#dep_lookup_bases Change-Id: I5b7cd71e0d45414ac0eff97fe9ba5d3ccd5bd9e6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@kde.org>
-rw-r--r--src/corelib/thread/qatomic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index 515e3c5dc2..6fe4d65832 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -153,14 +153,14 @@ public:
#ifdef QT_ARCH_PARISC
this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1;
#endif
- store(value);
+ this->store(value);
}
inline QAtomicPointer(const QAtomicPointer<T> &other)
{
#ifdef QT_ARCH_PARISC
this->_q_lock[0] = this->_q_lock[1] = this->_q_lock[2] = this->_q_lock[3] = -1;
#endif
- store(other.load());
+ this->store(other.load());
}
inline QAtomicPointer<T> &operator=(T *value)