From ca8d92f1d30b1519ccbfdab44e3868e9556b3fb5 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 6 Aug 2010 11:46:52 +0200
Subject: Optimize QSharedPointer::operator=(const QSharedPointer &)

internalSet check that stringref is > 0
Which is not required as we do not assign from a QWeakPointer

Reviewed-by: Thiago
Task-number: QTBUG-12700
---
 src/corelib/tools/qsharedpointer_impl.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index dd27f7e..7f0de5f 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -387,7 +387,13 @@ namespace QtSharedPointer {
         template <class X>
         inline void internalCopy(const ExternalRefCount<X> &other)
         {
-            internalSet(other.d, other.data());
+            Data *o = other.d;
+            T *actual = other.value;
+            if (o)
+                other.ref();
+            qSwap(d, o);
+            qSwap(this->value, actual);
+            deref(o, actual);
         }
 
         inline void internalSwap(ExternalRefCount &other)
-- 
cgit v0.12