summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-10-28 20:10:32 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-01 14:39:55 +0100
commit573d8b838bf51c2758e16fa98252c4acdf7874ff (patch)
tree2cf59099e3f5ba72788ad5dbfdb340311f693451 /src/corelib/thread
parent24f845dd200bfcaf71bd4e4f84b18d9da21fe67d (diff)
Tentatively keep operator=(const QAtomic* &other)
QAtomic* has a copy constructor, so it may make sense to allow assignment of one atomic variable to another. Change-Id: Ic754d13765080e2fcd13dc583940e354ad4404cd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 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.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h
index 14c328a6a6..34b9011575 100644
--- a/src/corelib/thread/qatomic.h
+++ b/src/corelib/thread/qatomic.h
@@ -85,7 +85,6 @@ public:
return *this;
}
- Q_DECL_DEPRECATED
inline QAtomicInt &operator=(const QAtomicInt &other)
{
this->store(other.load());
@@ -176,7 +175,6 @@ public:
return *this;
}
- Q_DECL_DEPRECATED
inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other)
{
this->store(other.load());