summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-10-28 13:34:18 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-28 13:43:26 +0200
commitd23c1a93234b2b0a8954c5c2d8affe8f2b930125 (patch)
treef68629fb13e9120957c5da9c5f436be529b2bf93 /src/corelib/thread
parent77d30df7e546fecbefaccb6435f8ee9d53639cac (diff)
Mark QAtomic* implicit cast and other operators as deprecated
Add Q_DECL_DEPRECATED to all methods that are pending removal once http://codereview.qt-project.org/#change,6243 is merged. This is necessary to give people time to react to the source incompatible change. Change-Id: Ia72f184d630d593f96dd1d95ad6cd0d3bd5d811c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r--src/corelib/thread/qatomic.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index 0b72ce9adf..14c328a6a6 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -78,33 +78,39 @@ public:
store(other.load());
}
+ Q_DECL_DEPRECATED
inline QAtomicInt &operator=(int value)
{
this->store(value);
return *this;
}
+ Q_DECL_DEPRECATED
inline QAtomicInt &operator=(const QAtomicInt &other)
{
this->store(other.load());
return *this;
}
+ Q_DECL_DEPRECATED
inline bool operator==(int value) const
{
return this->load() == value;
}
+ Q_DECL_DEPRECATED
inline bool operator!=(int value) const
{
return this->load() != value;
}
+ Q_DECL_DEPRECATED
inline operator int() const
{
return this->load();
}
+ Q_DECL_DEPRECATED
inline bool operator!() const
{
return !this->load();
@@ -163,38 +169,45 @@ public:
this->store(other.load());
}
+ Q_DECL_DEPRECATED
inline QAtomicPointer<T> &operator=(T *value)
{
this->store(value);
return *this;
}
+ Q_DECL_DEPRECATED
inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other)
{
this->store(other.load());
return *this;
}
+ Q_DECL_DEPRECATED
inline bool operator==(T *value) const
{
return this->load() == value;
}
+ Q_DECL_DEPRECATED
inline bool operator!=(T *value) const
{
return this->load() != value;
}
+ Q_DECL_DEPRECATED
inline bool operator!() const
{
return !this->load();
}
+ Q_DECL_DEPRECATED
inline operator T *() const
{
return this->load();
}
+ Q_DECL_DEPRECATED
inline T *operator->() const
{
return this->load();